From 92af5107d7c24846e458eaede525f33eaeca26bf Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Fri, 11 Aug 2023 16:16:22 +0300
Subject: [PATCH] Fix recursion issue on MacOS.

---
 src/libs/vmisc/theme/vtheme.cpp | 85 +++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/libs/vmisc/theme/vtheme.cpp b/src/libs/vmisc/theme/vtheme.cpp
index f92b91427..2ab2f2565 100644
--- a/src/libs/vmisc/theme/vtheme.cpp
+++ b/src/libs/vmisc/theme/vtheme.cpp
@@ -593,47 +593,70 @@ auto VTheme::GetResourceName(const QString &root, const QString &iconName) -> QS
 VTheme::VTheme(QObject *parent)
   : QObject(parent)
 {
+    bool isProcessingColorSchemeChange = false;
+
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-    QStyleHints *hints = QGuiApplication::styleHints();
-    connect(hints, &QStyleHints::colorSchemeChanged, this,
-            [this]()
+    auto colorSchemeChangedSlot = [this, &isProcessingColorSchemeChange]()
+    {
+        if (isProcessingColorSchemeChange)
+        {
+            return; // Already processing, avoid recursion
+        }
+
+        isProcessingColorSchemeChange = true;
+
+        VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
+        VThemeMode themeMode = settings->GetThemeMode();
+        if (themeMode == VThemeMode::System && VTheme::NativeDarkThemeAvailable())
+        {
+            if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark)
             {
-                VCommonSettings *settings = VAbstractApplication::VApp()->Settings();
-                VThemeMode themeMode = settings->GetThemeMode();
-                if (themeMode == VThemeMode::System && VTheme::NativeDarkThemeAvailable())
-                {
-                    if (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark)
-                    {
-                        settings->SetThemeMode(VThemeMode::Light);
-                    }
-                    else
-                    {
-                        settings->SetThemeMode(VThemeMode::Dark);
-                    }
+                settings->SetThemeMode(VThemeMode::Light);
+            }
+            else
+            {
+                settings->SetThemeMode(VThemeMode::Dark);
+            }
 
-                    ResetThemeSettings();
-                    QCoreApplication::processEvents();
-                    settings->SetThemeMode(themeMode);
-                }
+            ResetThemeSettings();
+            QCoreApplication::processEvents();
+            settings->SetThemeMode(themeMode);
+        }
 
-                ResetThemeSettings();
-            });
+        ResetThemeSettings();
+
+        isProcessingColorSchemeChange = false;
+    };
+
+    QStyleHints *hints = QGuiApplication::styleHints();
+    connect(hints, &QStyleHints::colorSchemeChanged, this, colorSchemeChangedSlot);
 #else
     if (VTheme::NativeDarkThemeAvailable())
     {
         m_darkTheme = IsInDarkTheme();
         m_themeTimer = new QTimer(this);
         m_themeTimer->setTimerType(Qt::VeryCoarseTimer);
-        connect(m_themeTimer, &QTimer::timeout, this,
-                [this]()
-                {
-                    bool darkTheme = IsInDarkTheme();
-                    if (m_darkTheme != darkTheme)
-                    {
-                        m_darkTheme = darkTheme;
-                        ResetThemeSettings();
-                    }
-                });
+
+        auto colorSchemeTimeoutCheck = [this, &isProcessingColorSchemeChange]()
+        {
+            if (isProcessingColorSchemeChange)
+            {
+                return; // Already processing, avoid recursion
+            }
+
+            isProcessingColorSchemeChange = true;
+
+            bool darkTheme = IsInDarkTheme();
+            if (m_darkTheme != darkTheme)
+            {
+                m_darkTheme = darkTheme;
+                ResetThemeSettings();
+            }
+
+            isProcessingColorSchemeChange = false;
+        };
+
+        connect(m_themeTimer, &QTimer::timeout, this, colorSchemeTimeoutCheck);
         m_themeTimer->start(V_SECONDS(5));
     }
 #endif // QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)