Revision: 16708
Author: datallah
Date: 2006-08-11 11:35:26 -0700 (Fri, 11 Aug 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16708&view=rev
Log Message:
-----------
Fix CID 122 - Avoid an assert when the conversation has been closed before a custom emoticon finishes loading
Modified Paths:
--------------
trunk/src/protocols/msn/slp.c
Modified: trunk/src/protocols/msn/slp.c
===================================================================
--- trunk/src/protocols/msn/slp.c 2006-08-11 13:35:26 UTC (rev 16707)
+++ trunk/src/protocols/msn/slp.c 2006-08-11 18:35:26 UTC (rev 16708)
@@ -768,14 +768,15 @@
gc = slpcall->slplink->session->account->gc;
who = slpcall->slplink->remote_user;
- conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account);
+ if ((conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, gc->account))) {
- /* FIXME: it would be better if we wrote the data as we received it
- instead of all at once, calling write multiple times and
- close once at the very end
- */
- gaim_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
- gaim_conv_custom_smiley_close(conv, slpcall->data_info );
+ /* FIXME: it would be better if we wrote the data as we received it
+ instead of all at once, calling write multiple times and
+ close once at the very end
+ */
+ gaim_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
+ gaim_conv_custom_smiley_close(conv, slpcall->data_info);
+ }
#ifdef MSN_DEBUG_UD
gaim_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
