Merge branch 'jb52659' into 'mer-5.6'

[qtbase] Fix crash on exit when there are pending dbus calls. Contributes to JB#52659 See merge request mer-core/qtbase!76
sailfishos · Feb 18, 2021 · e1ae027 · e1ae027
2 parents 0f928e0 + e79c6d3
commit e1ae027
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
@@ -68,6 +68,16 @@ static void preventDllUnload();
 
 Q_GLOBAL_STATIC(QDBusConnectionManager, _q_manager)
 
+static void shutdownConnectionManager()
+{
+    if (_q_manager.exists()) {
+        auto manager = _q_manager();
+
+        manager->quit();
+        manager->wait();
+    }
+}
+
 struct QDBusConnectionManager::ConnectionRequestData
 {
     enum RequestType {
@@ -142,12 +152,12 @@ QDBusConnectionManager::QDBusConnectionManager()
 #endif
     defaultBuses[0] = defaultBuses[1] = Q_NULLPTR;
     start();
+
+    qAddPostRoutine(shutdownConnectionManager);
 }
 
 QDBusConnectionManager::~QDBusConnectionManager()
 {
-    quit();
-    wait();
 }
 
 QDBusConnectionManager* QDBusConnectionManager::instance()