Mercurial > pidgin
diff libpurple/protocols/oscar/oscar.c @ 21085:7821fa7b22db
propagate from branch 'im.pidgin.pidgin' (head ef97aa9259d77504bb07c2dff5ec0750d498e847)
to branch 'org.maemo.garage.pidgin.pidgin.request-with-ui-hint' (head e8b5729ce3e73070299b06e0fba894a819d5cbb4)
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Wed, 10 Oct 2007 23:20:18 +0000 |
| parents | 488796f5ba33 9bdc5144bd96 |
| children | 84b9b98070e5 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Tue Oct 09 21:00:59 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Oct 10 23:20:18 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