From 06f9548d5f3b0909c8cdbd092dd3118c661be67b Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 1 Jul 2010 00:30:27 +0100 Subject: Disable the code added in the previous change during shutdown, since it's pointless at that stage and may cause crashes. --- irc_channel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'irc_channel.c') diff --git a/irc_channel.c b/irc_channel.c index b597e809..ffcfbffb 100644 --- a/irc_channel.c +++ b/irc_channel.c @@ -238,8 +238,14 @@ int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu, gboolean silent, co { ic->flags &= ~IRC_CHANNEL_JOINED; - if( ic->flags & IRC_CHANNEL_TEMP ) + if( ic->irc->status & USTATUS_SHUTDOWN ) + { + /* Don't do anything fancy when we're shutting down anyway. */ + } + else if( ic->flags & IRC_CHANNEL_TEMP ) + { irc_channel_free_soon( ic ); + } else { /* Flush userlist now. The user won't see it anyway. */ -- cgit v1.2.3