Fixed crash due to bad weak_ptr in ChatRoom

d2c788a0 · Sylvain Berfini · 655ce511 · d2c788a0
Commit d2c788a0 authored Oct 02, 2017 by Sylvain Berfini 🎩
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

src/chat/chat-room.cpp src/chat/chat-room.cpp +6 -3

No files found.
--- a/src/chat/chat-room.cpp
+++ b/src/chat/chat-room.cpp
@@ -88,9 +88,12 @@ void ChatRoomPrivate::release () {
 	isComposingHandler.stopTimers();

 	for (auto &message : weakMessages) {
-		shared_ptr<ChatMessage> msg(message);
-		msg->cancelFileTransfer();
-		msg->getPrivate()->setChatRoom(nullptr);
+		try {
+			shared_ptr<ChatMessage> msg(message);
+			msg->cancelFileTransfer();
+			msg->getPrivate()->setChatRoom(nullptr);
+		} catch(const std::bad_weak_ptr& e) {}
+		
 	}
 	for (auto &message : transientMessages) {
 		message->cancelFileTransfer();