X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=b103b42d80c5f7096f55ea62948f20c70a738a5d;hp=48e4f0f4fb538856328312bfcdbff2559f0a7c9d;hb=9f2fbea7c308914d0b737ec9a936a004d4687223;hpb=c068c516487c4699d5dbefe449d62c9ebad29684

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 48e4f0f4..b103b42d 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -81,6 +81,12 @@ Core::Core()
         delete _instance;
     }
     _instance = this;
+
+    // Parent all QObject-derived attributes, so when the Core instance gets moved into another
+    // thread, they get moved with it
+    _server.setParent(this);
+    _v6server.setParent(this);
+    _storageSyncTimer.setParent(this);
 }