Merge mainline stuff.

1 files changed, 5 insertions, 1 deletions

diff --git a/irc_user.c b/irc_user.c
index 8b290bbf..bf08c755 100644
--- a/irc_user.c
+++ b/irc_user.c
@@ -210,7 +210,11 @@ void irc_user_quit( irc_user_t *iu, const char *msg )
 		return;
 	
 	for( l = iu->irc->channels; l; l = l->next )
-		send_quit |= irc_channel_del_user( (irc_channel_t*) l->data, iu, IRC_CDU_SILENT, NULL );
+	{
+		irc_channel_t *ic = l->data;
+		send_quit |= irc_channel_del_user( ic, iu, IRC_CDU_SILENT, NULL ) &&
+		             ( ic->flags & IRC_CHANNEL_JOINED );
+	}
 	
 	if( send_quit )
 		irc_send_quit( iu, msg );