From 600fdc1eda6bd4d14e717b3712aed1a0f9c653cb Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Wed, 12 May 2021 09:39:53 +0200
Subject: [PATCH] fix crash enterforeground with VFS enabled

---
 Classes/ChatConversationTableView.m | 2 +-
 Classes/LinphoneAppDelegate.m       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Classes/ChatConversationTableView.m b/Classes/ChatConversationTableView.m
index 584c2708b..884d920cd 100644
--- a/Classes/ChatConversationTableView.m
+++ b/Classes/ChatConversationTableView.m
@@ -251,7 +251,7 @@ static const int BASIC_EVENT_LIST=15;
 }
 
 - (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath*)indexPath {
-	if ([[cell reuseIdentifier] isEqualToString:@"UIChatBubblePhotoCell"]) {
+	if (!_chatRoom && [[cell reuseIdentifier] isEqualToString:@"UIChatBubblePhotoCell"]) {
 		[(UIChatBubbleTextCell *)cell clearEncryptedFiles];
 	}
 }
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index eb0267797..1a9c2e2e8 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -67,6 +67,7 @@
 		if (PhoneMainView.instance.currentView == ChatConversationView.compositeViewDescription) {
 			ChatConversationView *view = VIEW(ChatConversationView);
 			[view removeCallBacks];
+			[view.tableController setChatRoom:NULL];
 		} else if (PhoneMainView.instance.currentView == ChatConversationInfoView.compositeViewDescription) {
 			ChatConversationInfoView *view = VIEW(ChatConversationInfoView);
 			[view removeCallbacks];