Merges from Irssi CVS.

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

diff --git a/apps/irssi/src/core/channels.c b/apps/irssi/src/core/channels.c
index 57288f7e7013383d64ca13c31f6f55d18a0817a3..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);
 
@@ -249,5 +249,4 @@ void channels_deinit(void)
        channels_setup_deinit();
 
        signal_remove("event connected", (SIGNAL_FUNC) event_connected);
-       module_uniq_destroy("CHANNEL");
 }