X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FWebInterface.java;h=d3ec1eec243528675fa30ea0bf15fcda22f8e762;hb=7815943b9ecc1199e11dd8be9736d6f3e892118e;hp=f55931813298b26ecbc3532f6e85a39e950b92d1;hpb=8b25ea98d342ed2e3e80914448156145a3e6757d;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 f559318..d3ec1ee 100644
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -684,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");
@@ -695,12 +696,8 @@ public class WebInterface implements CoreListener {
 	 */
 	@Override
 	public void soneUnlocked(Sone sone) {
-		Object tickerObject = lockedSonesTickerObjects.remove(sone);
-		if (tickerObject == null) {
-			return;
-		}
 		lockedSonesNotification.remove(sone);
-		Ticker.getInstance().deregisterEvent(tickerObject);
+		Ticker.getInstance().deregisterEvent(lockedSonesTickerObjects.remove(sone));
 	}
 
 	/**