From b45a3767275f2a5ae7146ef318527396f98b6645 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 31 Jul 2014 11:15:29 +0200 Subject: [PATCH] Fix crash in chatroom destroy --- coreapi/chat.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/coreapi/chat.c b/coreapi/chat.c index b115343e0..6679d9034 100644 --- a/coreapi/chat.c +++ b/coreapi/chat.c @@ -300,7 +300,8 @@ LinphoneChatRoom* linphone_core_get_or_create_chat_room(LinphoneCore* lc, const static void linphone_chat_room_delete_composing_idle_timer(LinphoneChatRoom *cr) { if (cr->composing_idle_timer) { - sal_cancel_timer(cr->lc->sal, cr->composing_idle_timer); + if(cr->lc->sal) + sal_cancel_timer(cr->lc->sal, cr->composing_idle_timer); belle_sip_object_unref(cr->composing_idle_timer); cr->composing_idle_timer = NULL; } @@ -308,7 +309,8 @@ static void linphone_chat_room_delete_composing_idle_timer(LinphoneChatRoom *cr) static void linphone_chat_room_delete_composing_refresh_timer(LinphoneChatRoom *cr) { if (cr->composing_refresh_timer) { - sal_cancel_timer(cr->lc->sal, cr->composing_refresh_timer); + if(cr->lc->sal) + sal_cancel_timer(cr->lc->sal, cr->composing_refresh_timer); belle_sip_object_unref(cr->composing_refresh_timer); cr->composing_refresh_timer = NULL; } @@ -316,7 +318,8 @@ static void linphone_chat_room_delete_composing_refresh_timer(LinphoneChatRoom * static void linphone_chat_room_delete_remote_composing_refresh_timer(LinphoneChatRoom *cr) { if (cr->remote_composing_refresh_timer) { - sal_cancel_timer(cr->lc->sal, cr->remote_composing_refresh_timer); + if(cr->lc->sal) + sal_cancel_timer(cr->lc->sal, cr->remote_composing_refresh_timer); belle_sip_object_unref(cr->remote_composing_refresh_timer); cr->remote_composing_refresh_timer = NULL; }