Merges from Irssi CVS.

[crypto.git] / apps / irssi / src / core / channels.c

diff --git a/apps/irssi/src/core/channels.c b/apps/irssi/src/core/channels.c
index 06bf0c411f78c817fe8d96f5df2c3dc97dec69cd..1884c4021d86dd34585dc37e0d047c1ecba49dc8 100644 (file)
--- a/apps/irssi/src/core/channels.c
+++ b/apps/irssi/src/core/channels.c
@@ -64,7 +64,7 @@ void channel_destroy(CHANNEL_REC *channel)
        channel->destroying = TRUE;
 
        channels = g_slist_remove(channels, channel);
-       if (channel->server != NULL)
+       if (!channel->server->disconnected)
                channel->server->channels = g_slist_remove(channel->server->channels, channel);
        signal_emit("channel destroyed", 1, channel);