summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-02-14 18:00:51 (GMT)
committerThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-02-14 18:02:16 (GMT)
commit9f63c4a1456e154e6b48de2f9a8fa5105c8c020b (patch)
tree4f3fa39370bec74aec729e709bf6332bfc0bdb45 /Swift/Controllers/Chat/ChatController.h
parent1b99be2dc6470f13fba252264e82a3571768d199 (diff)
downloadswift-9f63c4a1456e154e6b48de2f9a8fa5105c8c020b.zip
swift-9f63c4a1456e154e6b48de2f9a8fa5105c8c020b.tar.bz2
Fix a crash that occurs when inviting users in a chat
After inviting people to a chat, and converting to a MUC room, some of the chat window signals were still signaling the original chat controller, that has been destroying, causing a crash. Test-Information: Tested the changes in Windows 10 (64 bit), after triggering the dayChangeTimer, and onContinuationsBroken signal that was causing the crash. Change-Id: I70a80ab2653ed87a1dbea851157d95fb5918913f
Diffstat (limited to 'Swift/Controllers/Chat/ChatController.h')
-rw-r--r--Swift/Controllers/Chat/ChatController.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatController.h b/Swift/Controllers/Chat/ChatController.h
index d5011e4..a9093d0 100644
--- a/Swift/Controllers/Chat/ChatController.h
+++ b/Swift/Controllers/Chat/ChatController.h
@@ -113,6 +113,7 @@ namespace Swift {
boost::signals2::scoped_connection blockingOnStateChangedConnection_;
boost::signals2::scoped_connection blockingOnItemAddedConnection_;
boost::signals2::scoped_connection blockingOnItemRemovedConnection_;
+ boost::signals2::scoped_connection continuationsBrokenConnection_;
boost::optional<ChatWindow::AlertID> deliveryReceiptAlert_;
boost::optional<ChatWindow::AlertID> blockedContactAlert_;