X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_notify.c;h=005299c61f1a0610c9a3186c8c939f471ed5aca1;hb=24044237b5a291b34afbc253406e7117f7c7a63e;hp=10c36a324f8fa5bae0fd151cbc1dc5789f061133;hpb=aecbdf1760268271936ee3e54f36bb7dd214a343;p=silc.git

diff --git a/lib/silcclient/client_notify.c b/lib/silcclient/client_notify.c
index 10c36a32..005299c6 100644
--- a/lib/silcclient/client_notify.c
+++ b/lib/silcclient/client_notify.c
@@ -503,7 +503,7 @@ SILC_FSM_STATE(silc_client_notify_signoff)
   SilcNotifyType type = silc_notify_get_type(payload);
   SilcArgumentPayload args = silc_notify_get_args(payload);
   SilcClientEntry client_entry;
-  SilcChannelEntry channel;
+  SilcChannelEntry channel = NULL;
   unsigned char *tmp;
   SilcUInt32 tmp_len;
   SilcID id;
@@ -524,20 +524,19 @@ SILC_FSM_STATE(silc_client_notify_signoff)
   if (tmp && tmp_len > 128)
     tmp[128] = '\0';
 
+  if (packet->dst_id_type == SILC_ID_CHANNEL) 
+    if (silc_id_str2id(packet->dst_id, packet->dst_id_len, SILC_ID_CHANNEL,
+		       &id.u.channel_id, sizeof(id.u.channel_id)))
+      channel = silc_client_get_channel_by_id(client, conn, &id.u.channel_id);
+
   /* Notify application */
   if (client_entry->internal.valid)
-    NOTIFY(client, conn, type, client_entry, tmp);
+    NOTIFY(client, conn, type, client_entry, tmp, channel);
 
   /* Remove from channel */
-  if (packet->dst_id_type == SILC_ID_CHANNEL) {
-    if (silc_id_str2id(packet->dst_id, packet->dst_id_len, SILC_ID_CHANNEL,
-		       &id.u.channel_id, sizeof(id.u.channel_id))) {
-      channel = silc_client_get_channel_by_id(client, conn, &id.u.channel_id);
-      if (channel) {
-	silc_client_remove_from_channel(client, conn, channel, client_entry);
-	silc_client_unref_channel(client, conn, channel);
-      }
-    }
+  if (channel) {
+    silc_client_remove_from_channel(client, conn, channel, client_entry);
+    silc_client_unref_channel(client, conn, channel);
   }
 
   /* Delete client */