X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=8d983d59d17a13b7870d24084d1f67daaa2f5173;hb=0e84cf6dbee5bc509d5e3d64c3347a3046810d9d;hp=171683b9a71892438a3b8476080333776e5507c4;hpb=c45f3f052f1ade1291732bc92e14e6c741a564ff;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 171683b..8d983d5 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -41,6 +41,7 @@ import net.pterodactylus.irc.DccReceiver;
 import net.pterodactylus.irc.event.ChannelJoined;
 import net.pterodactylus.irc.event.ChannelLeft;
 import net.pterodactylus.irc.event.ChannelMessageReceived;
+import net.pterodactylus.irc.event.ChannelNotJoined;
 import net.pterodactylus.irc.event.ClientQuit;
 import net.pterodactylus.irc.event.ConnectionClosed;
 import net.pterodactylus.irc.event.ConnectionEstablished;
@@ -598,6 +599,19 @@ public class Core extends AbstractExecutionThreadService {
 
 		/* have we been kicked? */
 		if (nicknameMatchesConnection(kickedFromChannel.connection(), kickedFromChannel.kickee())) {
+			Optional<Channel> channel = getChannel(network.get(), kickedFromChannel.channel());
+			if (!channel.isPresent()) {
+				/* maybe it was an extra channel? */
+				channel = getExtraChannel(network.get(), kickedFromChannel.channel());
+				if (!channel.isPresent()) {
+					/* okay, whatever. */
+					return;
+				}
+
+				extraChannels.remove(channel);
+			} else {
+				channels.remove(channel.get());
+			}
 			eventBus.post(new GenericMessage(format(
 					"Kicked from %s/%s by %s: %s",
 					kickedFromChannel.channel(), network.get(),