X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=6248d0f34373a2a5d3a0085c4cbe733d010d4750;hb=07d69b4c3ca01686693b52b11d9ac4f560a5215a;hp=659ce9b4577ab70c1355bd9a48b0a133a21df944;hpb=080bbbe88d4277b8bd4c5c6c2596f79c42711be8;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 659ce9b..6248d0f 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -246,7 +246,22 @@ public class WebInterface implements CoreListener {
 	 *         currently logged in
 	 */
 	public Sone getCurrentSone(ToadletContext toadletContext) {
-		return getCurrentSone(getCurrentSession(toadletContext));
+		return getCurrentSone(toadletContext, true);
+	}
+
+	/**
+	 * Returns the currently logged in Sone.
+	 *
+	 * @param toadletContext
+	 *            The toadlet context
+	 * @param create
+	 *            {@code true} to create a new session if no session exists,
+	 *            {@code false} to not create a new session
+	 * @return The currently logged in Sone, or {@code null} if no Sone is
+	 *         currently logged in
+	 */
+	public Sone getCurrentSone(ToadletContext toadletContext, boolean create) {
+		return getCurrentSone(getCurrentSession(toadletContext, create));
 	}
 
 	/**
@@ -669,6 +684,7 @@ public class WebInterface implements CoreListener {
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				lockedSonesNotification.add(sone);
+				lockedSonesTickerObjects.remove(sone);
 				notificationManager.addNotification(lockedSonesNotification);
 			}
 		}, "Sone Locked Notification");