From c8616f0eb37d27e43b8b0d085506ebf586f4d67f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 2 Oct 2017 11:56:56 +0200
Subject: [PATCH] Done ChatRoom::release

---
 src/chat/chat-room.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/chat/chat-room.cpp b/src/chat/chat-room.cpp
index 6b244668d..e8fa7b045 100644
--- a/src/chat/chat-room.cpp
+++ b/src/chat/chat-room.cpp
@@ -41,12 +41,7 @@ LINPHONE_BEGIN_NAMESPACE
 ChatRoomPrivate::ChatRoomPrivate (LinphoneCore *core)
 	: core(core), isComposingHandler(core, this) {}
 
-ChatRoomPrivate::~ChatRoomPrivate () {
-	/*for (auto &message : transientMessages)
-		linphone_chat_message_release(message);
-	if (pendingMessage)
-		linphone_chat_message_unref(pendingMessage);*/
-}
+ChatRoomPrivate::~ChatRoomPrivate () {}
 
 // -----------------------------------------------------------------------------
 
@@ -92,10 +87,15 @@ void ChatRoomPrivate::release () {
 	L_Q();
 	isComposingHandler.stopTimers();
 
-	/*for (auto &message : weakMessages)
-		linphone_chat_message_deactivate(message);
-	for (auto &message : transientMessages)
-		linphone_chat_message_deactivate(message);*/
+	for (auto &message : weakMessages) {
+		shared_ptr<ChatMessage> msg(message);
+		msg->cancelFileTransfer();
+		msg->getPrivate()->setChatRoom(nullptr);
+	}
+	for (auto &message : transientMessages) {
+		message->cancelFileTransfer();
+		message->getPrivate()->setChatRoom(nullptr);
+	}
 
 	core = nullptr;
 	linphone_chat_room_unref(L_GET_C_BACK_PTR(q));