Fix autojoins for sessions

1 files changed, 2 insertions, 2 deletions

diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 8beb83f2..792927db 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -185,13 +185,13 @@ irc_join_list (server *serv, GSList *favorites)
 
 		g_string_append (chanlist, fav->name);
 
-		if (fav->key)
+		if (fav->key && strlen (fav->key))					/* strlen() is required since key can be '' for session->channelkey */
 		{
 			g_string_append (keylist, fav->key);
 		}
 		else
 		{
-			g_string_append_c (keylist, 'x');				/* 'x' filler for keyless channels */
+			g_string_append_c (keylist, 'x');				/* 'x' filler for keyless channels so that our JOIN command is always well-formatted */
 		}
 
 		first_item = 0;