# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1145110490 0
# Node ID 2c84df43f1266f72179270d8d99e487b3915923a
# Parent  8872789902a1ae46a260108016f0e97741148f9b
[gaim-migrate @ 16033]
Fix Coverity CID 119

committer: Tailor Script <tailor@pidgin.im>

diff -r 8872789902a1 -r 2c84df43f126 src/protocols/silc/silc.c
--- a/src/protocols/silc/silc.c	Sat Apr 15 13:39:26 2006 +0000
+++ b/src/protocols/silc/silc.c	Sat Apr 15 14:14:50 2006 +0000
@@ -1247,7 +1247,7 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	GaimConnection *gc;
-	GaimConversation *convo;
+	GaimConversation *convo = conv;
 	int id = 0;
 
 	gc = gaim_conversation_get_gc(conv);
@@ -1255,13 +1255,12 @@
 	if (gc == NULL)
 		return GAIM_CMD_RET_FAILED;
 
-	if(args && args[0]) {
+	if(args && args[0])
 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, args[0],
 									gc->account);
-	} else
-		convo = conv;
 
-	id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
+	if (convo != NULL)
+		id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
 
 	if (id == 0)
 		return GAIM_CMD_RET_FAILED;