Mercurial > pidgin.yaz

diff libpurple/protocols/oscar/oscar.c @ 20336:b93e7be3847b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied changes from 9d35dde0c779cca73548172223ba557f27d61882 through cd26f6af7f8ee75ef909ae08b06ad5a1978051d9
author Luke Schierer <lschiere@pidgin.im>
date Sat, 20 Oct 2007 15:57:22 +0000
parents 233c423d40d3
children 0484600ac434
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c	Fri Oct 19 18:36:08 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Oct 20 15:57:22 2007 +0000
@@ -1128,8 +1128,10 @@
 	aim_clientready(od, conn);
 
 	chatcon = find_oscar_chat_by_conn(gc, conn);
-	chatcon->id = id;
-	chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show);
+	if (chatcon) {
+		chatcon->id = id;
+		chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show);
+	}
 }
 
 static void