Mercurial > pidgin.yaz
changeset 14085:682394f005dd
[gaim-migrate @ 16708]
Fix CID 122 - Avoid an assert when the conversation has been closed before a custom emoticon finishes loading
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 11 Aug 2006 18:35:26 +0000 |
| parents | b7e4180af1db |
| children | 545dbc931e8c |
| files | src/protocols/msn/slp.c |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/msn/slp.c Fri Aug 11 08:08:19 2006 +0000 +++ b/src/protocols/msn/slp.c Fri Aug 11 18:35:26 2006 +0000 @@ -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