Remove channel we’re kicked from from the correct collection.

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / core / Core.java

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 7355283..30da4a8 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -384,6 +384,9 @@ public class Core extends AbstractExecutionThreadService {
                                        /* ignore. */
                                }
                        }
+                       if (!isRunning()) {
+                               break;
+                       }
 
                        /* find channels that should be monitored but are not. */
                        for (Channel channel : channels) {
@@ -411,7 +414,7 @@ public class Core extends AbstractExecutionThreadService {
        }
 
        @Override
-       protected void shutDown() {
+       protected void triggerShutdown() {
                synchronized (syncObject) {
                        syncObject.notifyAll();
                }
@@ -674,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",