X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=5e5f59d497b449825c38f7aee30995cea37f06ff;hp=3ac73bc0bc10aaf9808374c1a114a1686d4e7b0f;hb=16a42dff7db80813c69527e7f44ec1ca6e6371cb;hpb=3b305252082a131cc2831afda10fb3030a4b4e44

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);
+    }
 }