From 308c3c8248e6b1852df82c1efb49a647f0342aa8 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 22 Sep 2022 10:14:54 +0200
Subject: [PATCH] Fix errors when conversation has no chat room.

---
 linphone-app/ui/views/App/Main/Conversation.qml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml
index 65036c687..97105ba28 100644
--- a/linphone-app/ui/views/App/Main/Conversation.qml
+++ b/linphone-app/ui/views/App/Main/Conversation.qml
@@ -624,9 +624,9 @@ ColumnLayout  {
 		proxyModel: ChatRoomProxyModel {
 			id: chatRoomProxyModel
 			
-			Component.onCompleted: {
-				if ( (!chatRoomModel.haveEncryption && !SettingsModel.standardChatEnabled)
-						|| (chatRoomModel.haveEncryption && !SettingsModel.secureChatEnabled) ) {
+			function updateFilter(){
+			if ( chatRoomModel && ((!chatRoomModel.haveEncryption && !SettingsModel.standardChatEnabled)
+						|| (chatRoomModel.haveEncryption && !SettingsModel.secureChatEnabled)) ) {
 					setEntryTypeFilter(ChatRoomModel.CallEntry)
 				}
 			}
@@ -635,6 +635,11 @@ ColumnLayout  {
 			fullPeerAddress: conversation.fullPeerAddress
 			fullLocalAddress: conversation.fullLocalAddress
 			localAddress: conversation.localAddress// Reload is done on localAddress. Use this order
+			
+			onChatRoomModelChanged: updateFilter()
+			Component.onCompleted: {
+				updateFilter()
+			}
 		}
 	}