aboutsummaryrefslogtreecommitdiffstats
path: root/irc_channel.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-07-01 00:30:27 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2010-07-01 00:30:27 +0100
commit06f9548d5f3b0909c8cdbd092dd3118c661be67b (patch)
tree7aab5568cd13e756f73f8d35ee10e0dcaf2b642b /irc_channel.c
parent9052bc147b30a08c8df6799df09b01f922c10be7 (diff)
Disable the code added in the previous change during shutdown, since it's
pointless at that stage and may cause crashes.
Diffstat (limited to 'irc_channel.c')
-rw-r--r--irc_channel.c8
1 files changed, 7 insertions, 1 deletions
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. */