X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-channels.c;h=4311cca5a8963f3b0496005479764076f19c293d;hp=160e86cb9ce1266f6325af2a519be610feff14c2;hb=c263fd18a290c8ba0d5e31936aa723fe6e8361c3;hpb=92a5750a53193a067f69883d2d5fe7cf8378b17a

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index 160e86cb..4311cca5 100644
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -135,7 +135,7 @@ static void silc_channels_join(SILC_SERVER_REC *server,
     schannel = channel_setup_find(channel, server->connrec->chatnet);
     if (key && *key != '\0')
 	    g_string_sprintfa(tmpstr, "%s %s", channel, key);
-    else if (schannel->password && schannel->password[0] != '\0')
+    else if (schannel && schannel->password && schannel->password[0] != '\0')
 	    g_string_sprintfa(tmpstr, "%s %s", channel, schannel->password);
     else
 	    g_string_sprintfa(tmpstr, "%s", channel);