From a88c5011541aa3bafc62ea4be44f24b4e97114e3 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 20 Dec 2019 11:57:49 +0100 Subject: [PATCH] fix crash unknow --- Classes/ChatConversationView.m | 4 ++-- Classes/LinphoneCoreSettingsStore.m | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index c3d6ea243..bd9763a04 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -488,8 +488,8 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)updateSuperposedButtons { [_backToCallButton update]; - LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom); - _infoButton.hidden = ((capabilities & LinphoneChatRoomCapabilitiesOneToOne) + BOOL isOneToOneChat = _chatRoom && (linphone_chat_room_get_capabilities(_chatRoom) & LinphoneChatRoomCapabilitiesOneToOne); + _infoButton.hidden = ((isOneToOneChat & LinphoneChatRoomCapabilitiesOneToOne) || !_backToCallButton.hidden || _tableController.tableView.isEditing); _callButton.hidden = !_backToCallButton.hidden || !_infoButton.hidden || _tableController.tableView.isEditing; diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index e9526cc37..660dd0afd 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -181,9 +181,9 @@ [self setBool:pushEnabled forKey:@"account_pushnotification_preference"]; } const LinphoneAddress *identity_addr = linphone_proxy_config_get_identity_address(proxy); - if (identity_addr) { - const char *server_addr = linphone_proxy_config_get_server_addr(proxy); - LinphoneAddress *proxy_addr = linphone_core_interpret_url(LC, server_addr); + const char *server_addr = linphone_proxy_config_get_server_addr(proxy); + LinphoneAddress *proxy_addr = linphone_core_interpret_url(LC, server_addr); + if (identity_addr && proxy_addr) { int port = linphone_address_get_port(proxy_addr); [self setCString:linphone_address_get_username(identity_addr)