fix: crashed on palette destroyed

do not set value if app is about to quit Issue: linuxdeepin/dtk#193
linuxdeepin · Aug 27, 2024 · ac94025 · ac94025
1 parent c79435a
commit ac94025
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/private/dqmlglobalobject.cpp b/src/private/dqmlglobalobject.cpp
@@ -128,9 +128,13 @@ DColor DColor::opacity(qint8 floatValue) const
     return newColor;
 }
 
+bool DQMLGlobalObjectPrivate::g_appAboutToQuit = false;
 DQMLGlobalObjectPrivate::DQMLGlobalObjectPrivate(DQMLGlobalObject *qq)
     : DTK_CORE_NAMESPACE::DObjectPrivate(qq)
 {
+    QObject::connect(qApp, &QCoreApplication::aboutToQuit, [](){
+        g_appAboutToQuit = true;
+    });
 }
 
 void DQMLGlobalObjectPrivate::ensurePalette()

diff --git a/src/private/dqmlglobalobject_p_p.h b/src/private/dqmlglobalobject_p_p.h
@@ -35,6 +35,7 @@ class DQMLGlobalObjectPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate
     QString deepinWebsiteName;
     QString deepinWebsiteLink;
     QString deepinDistributionOrgLogo;
+    static bool g_appAboutToQuit;
 
 private:
     D_DECLARE_PUBLIC(DQMLGlobalObject)

diff --git a/src/private/dquickcontrolpalette.cpp b/src/private/dquickcontrolpalette.cpp
@@ -4,6 +4,7 @@
 
 #include "dquickcontrolpalette_p.h"
 #include "dquickglobal_p.h"
+#include "dqmlglobalobject_p_p.h"
 
 #include <DGuiApplicationHelper>
 
@@ -937,7 +938,7 @@ void DQuickControlColorSelector::notifyColorPropertyChanged()
 
 void DQuickControlColorSelector::updatePropertyFromName(const QByteArray &name, const DQuickControlPalette *palette)
 {
-    if (QCoreApplication::closingDown())
+    if (QCoreApplication::closingDown() || DQMLGlobalObjectPrivate::g_appAboutToQuit)
         return;
     Q_ASSERT(!name.isEmpty());
     QColor color;