From 4597317d2d72fa7b37e72388565afbf94ccbda89 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 1 Feb 2023 11:06:22 +0100
Subject: [PATCH] QmlDesigner: Fix crash

Task-number: QDS-9009
Change-Id: Id2c862e1890ecfc0f2d14bf58eb6cb4c5112d0ba
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/libs/utils/stylehelper.cpp | 2 +-
 src/libs/utils/theme/theme.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index e8f46f40026..5f305abf16e 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -636,7 +636,7 @@ QLinearGradient StyleHelper::statusBarGradient(const QRect &statusBarRect)
 
 bool StyleHelper::isQDSTheme()
 {
-    return creatorTheme()->flag(Theme::QDSTheme);
+    return creatorTheme() ? creatorTheme()->flag(Theme::QDSTheme) : false;
 }
 
 QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> &parameters)
diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index 8221b455a3b..b8404e10b79 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -91,6 +91,9 @@ Theme::Theme(Theme *originTheme, QObject *parent)
 
 Theme::~Theme()
 {
+    if (this == m_creatorTheme)
+        m_creatorTheme = nullptr;
+
     delete d;
 }