From 54dfce82a771b48e2d556fd3e366a99790ae1037 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Wed, 15 Apr 2020 21:28:19 +0200 Subject: [PATCH] fix crash of remove null callbacks --- Classes/ChatConversationView.m | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index f876e9a08..34c8db8cb 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -203,10 +203,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; - if (_chatRoom && _chatRoomCbs) { - linphone_chat_room_remove_callbacks(_chatRoom, _chatRoomCbs); - _chatRoomCbs = NULL; - } + [self removeCallBacks]; [_messageField resignFirstResponder]; @@ -217,8 +214,14 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)didEnterBackground:(NSNotification *)notif { - linphone_chat_room_remove_callbacks(_chatRoom, _chatRoomCbs); - _chatRoomCbs = NULL; + [self removeCallBacks]; +} + +- (void)removeCallBacks { + if (_chatRoom && _chatRoomCbs) { + linphone_chat_room_remove_callbacks(_chatRoom, _chatRoomCbs); + _chatRoomCbs = NULL; + } } - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {