From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 25 Sep 2018 22:47:14 +0000 (+0200)
Subject: common: Avoid crash on SignalProxy destruction
X-Git-Tag: 0.13-rc2~19
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=16a42dff7db80813c69527e7f44ec1ca6e6371cb

common: Avoid crash on SignalProxy destruction

Since SignalProxy itself attaches a slot, it will try to detach
itself on destruction, leading to a crash. Avoid this by checking
for self-detachment.
---

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 3ac73bc0..5e5f59d4 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -475,8 +475,11 @@ void SignalProxy::synchronize(SyncableObject *obj)
 
 void SignalProxy::detachObject(QObject *obj)
 {
-    detachSignals(obj);
-    detachSlots(obj);
+    // Don't try to connect SignalProxy from itself on shutdown
+    if (obj != this) {
+        detachSignals(obj);
+        detachSlots(obj);
+    }
 }