X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=30da4a88cb9b66cfff1dd572cf6b8a5376273b11;hb=e89d921415a0ae26ebb5bb7cee7a1e72fc0418b4;hp=1b45c6af4aa52f17cb22c6d9a3fdac5b8b7d42c7;hpb=f8b1b38d714ac20b94867919582cce31ef7b807c;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 1b45c6a..30da4a8 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -105,6 +105,7 @@ public class Core extends AbstractExecutionThreadService {
 	/** The logger. */
 	private static final Logger logger = Logger.getLogger(Core.class.getName());
 
+	private final Object syncObject = new Object();
 	/** The event bus. */
 	private final EventBus eventBus;
 	private final ConnectionFactory connectionFactory;
@@ -376,10 +377,15 @@ public class Core extends AbstractExecutionThreadService {
 	@Override
 	protected void run() throws Exception {
 		while (isRunning()) {
-			try {
-				Thread.sleep(TimeUnit.MINUTES.toMillis(1));
-			} catch (InterruptedException ie1) {
-				/* ignore. */
+			synchronized (syncObject) {
+				try {
+					syncObject.wait(TimeUnit.MINUTES.toMillis(1));
+				} catch (InterruptedException ie1) {
+					/* ignore. */
+				}
+			}
+			if (!isRunning()) {
+				break;
 			}
 
 			/* find channels that should be monitored but are not. */
@@ -408,7 +414,10 @@ public class Core extends AbstractExecutionThreadService {
 	}
 
 	@Override
-	protected void shutDown() {
+	protected void triggerShutdown() {
+		synchronized (syncObject) {
+			syncObject.notifyAll();
+		}
 	}
 
 	//
@@ -668,9 +677,9 @@ public class Core extends AbstractExecutionThreadService {
 					return;
 				}
 
-				extraChannels.remove(channel);
+				extraChannels.remove(channel.get());
 			} else {
-				channels.remove(channel.get());
+				joinedChannels.remove(channel.get());
 			}
 			eventBus.post(new GenericMessage(format(
 					"Kicked from %s by %s: %s",