Commit Diff


commit - 8e193df973bef0765754ccf4d6cb3ea21c226955
commit + 8fa92f0a24bb97a972ef82b8fa057d737c9f55b7
blob - a36131c0031f3c99e3bf2cd0ad359f622d932c4d
blob + 74c97a0a8dc41abe99c30981d0f840402f040df9
--- src/ngircd/channel.c
+++ src/ngircd/channel.c
@@ -110,10 +110,13 @@ Channel_InitPredefined( void )
 	assert(channel_count == 0 || conf_chan != NULL);
 
 	for (i = 0; i < channel_count; i++, conf_chan++) {
-		if (!conf_chan->name[0] || !Channel_IsValidName(conf_chan->name)) {
-			Log(LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"",
-									conf_chan->name);
+		if (!conf_chan->name[0])
 			continue;
+		if (!Channel_IsValidName(conf_chan->name)) {
+			Log(LOG_ERR,
+			    "Can't create pre-defined channel: invalid name: \"%s\"",
+			    conf_chan->name);
+			continue;
 		}
 
 		new_chan = Channel_Search(conf_chan->name);