Merge pull request #4398 from nextcloud/bufix/crash-on-exit

Darkmode. Fix crash on exit.

4 files changed, 8 insertions, 21 deletions

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 5320ade69..9fbd620eb 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -111,22 +111,12 @@ public:
     bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) {
         const auto msg = static_cast<MSG *>(message);
         if(msg->message == WM_SYSCOLORCHANGE || msg->message == WM_SETTINGCHANGE) {
-            if(!_guiAppInstance) {
-                const auto ptr = qobject_cast<QGuiApplication *>(QGuiApplication::instance());
-                if(ptr) {
-                    _guiAppInstance.reset(ptr);
-                }
-            }
-
-            if(_guiAppInstance) {
-                emit _guiAppInstance->paletteChanged(_guiAppInstance->palette());
+            if (const auto ptr = qobject_cast<QGuiApplication *>(QGuiApplication::instance())) {
+                emit ptr->paletteChanged(ptr->palette());
             }
         }
         return false;
     }
-
-private:
-    QScopedPointer<QGuiApplication> _guiAppInstance;
 };
 #endif
 
diff --git a/src/gui/systray.h b/src/gui/systray.h
index d5cdce358..0b4aabc3e 100644
--- a/src/gui/systray.h
+++ b/src/gui/systray.h
@@ -120,8 +120,6 @@ private:
     QPointer<QQmlApplicationEngine> _trayEngine;
 
     AccessManagerFactory _accessManagerFactory;
-
-    QScopedPointer<QGuiApplication> _guiAppInstance;
 };
 
 } // namespace OCC
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 34bea7287..eb2268ca2 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -904,12 +904,11 @@ QColor Theme::errorBoxBorderColor() const
 
 void Theme::connectToPaletteSignal()
 {
-    if(!_guiAppInstance) {
-        const auto ptr = qobject_cast<QGuiApplication *>(QGuiApplication::instance());
-        if(ptr) {
-            _guiAppInstance.reset(ptr);
-            connect(_guiAppInstance.data(), &QGuiApplication::paletteChanged, this, &Theme::systemPaletteChanged);
-            connect(_guiAppInstance.data(), &QGuiApplication::paletteChanged, this, &Theme::darkModeChanged);
+    if (!_paletteSignalsConnected) {
+        if (const auto ptr = qobject_cast<QGuiApplication *>(QGuiApplication::instance())) {
+            connect(ptr, &QGuiApplication::paletteChanged, this, &Theme::systemPaletteChanged);
+            connect(ptr, &QGuiApplication::paletteChanged, this, &Theme::darkModeChanged);
+            _paletteSignalsConnected = true;
         }
     }
 }
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index df9303b23..180efbec2 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -627,7 +627,7 @@ private:
 
     static Theme *_instance;
     bool _mono = false;
-    QScopedPointer<QGuiApplication> _guiAppInstance;
+    bool _paletteSignalsConnected = false;
 
 #ifndef TOKEN_AUTH_ONLY
     mutable QHash<QString, QIcon> _iconCache;