New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 19 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp b/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp
index 89092d6..ee8a0b9 100644
--- a/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/themetuner.cpp
@@ -35,7 +35,7 @@ void ThemeTuner::manageCompactLayout(QWidget* w)
 void ThemeTuner::manageCompactLayout(QList<QWidget*> wList)
 {
     widgetsForCompactLayout += wList;
-    for (QWidget* w : wList)
+    for (QWidget*& w : wList)
         connect(w, SIGNAL(destroyed()), this, SLOT(handleWidgetDestroyed()));
 
     handleCompactLayoutChange(CFG_UI.General.CompactLayout.get());
@@ -60,11 +60,27 @@ void ThemeTuner::darkThemeFix(QWizard* wizard)
 
 void ThemeTuner::registerQWizardThemeTuneRequired(const QString& styleName)
 {
+    if (MAINWINDOW->isClosingApp())
+        return;
+
+    getInstance()->registerQWizardThemeTuneRequiredInternal(styleName);
+}
+
+void ThemeTuner::registerQWizardThemeTuneRequiredInternal(const QString& styleName)
+{
     qwizardThemeTuneRequired << styleName;
 }
 
 void ThemeTuner::deregisterQWizardThemeTuneRequired(const QString& styleName)
 {
+    if (MAINWINDOW->isClosingApp())
+        return;
+
+    getInstance()->deregisterQWizardThemeTuneRequiredInternal(styleName);
+}
+
+void ThemeTuner::deregisterQWizardThemeTuneRequiredInternal(const QString& styleName)
+{
     qwizardThemeTuneRequired.removeOne(styleName);
 }
 
@@ -126,7 +142,7 @@ void ThemeTuner::handleCompactLayoutChange(const QVariant& newValue)
 {
     if (newValue.toBool())
     {
-        for (QWidget* w : widgetsForCompactLayout)
+        for (QWidget*& w : widgetsForCompactLayout)
         {
             w->layout()->setContentsMargins(0, 0, 0, 0);
             w->layout()->setSpacing(0);
@@ -134,7 +150,7 @@ void ThemeTuner::handleCompactLayoutChange(const QVariant& newValue)
     }
     else
     {
-        for (QWidget* w : widgetsForCompactLayout)
+        for (QWidget*& w : widgetsForCompactLayout)
         {
             w->layout()->setContentsMargins(-1, -1, -1, -1);
             w->layout()->setSpacing(-1);