Merge branch 'master' into bip08

2009-01-10 12:55:13 +01:00 · 2009-01-10 12:55:13 +01:00 · 744ea7d03b
parent f536a0546d 67ddf15264
commit 744ea7d03b
1 changed files with 2 additions and 1 deletions
--- a/src/irc.c
+++ b/src/irc.c
@ -1011,9 +1011,10 @@ static int irc_cli_join(struct link_client *irc, struct line *line)
 				kp[klen] = 0;
 				if (*ke == 0)
 					ks = NULL;
-			} else
+			} else {
 				kp = NULL;
 				ks = NULL;
+			}
 		}

 		irc_add_channel_info(LINK(irc)->l_server, p, kp);