Merge pull request #3702 from Holzhaus/pref-skin-preview-fix

DlgPrefInterface: Fix missing preview image for skins without schemes
mixxxdj · Mar 13, 2021 · 3885379 · 3885379
2 parents d72af1b + 8ca002d
commit 3885379
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/preferences/dialog/dlgprefinterface.cpp b/src/preferences/dialog/dlgprefinterface.cpp
@@ -361,7 +361,14 @@ void DlgPrefInterface::notifyRebootNecessary() {
 }
 
 void DlgPrefInterface::slotSetScheme(int) {
-    QString newScheme = ComboBoxSchemeconf->currentText();
+    // This slot can be triggered by opening the preferences. If the current
+    // skin does not support color schemes, this would treat the string in the
+    // combobox as color scheme name. Therefore we need to check if the
+    // checkbox is actually enabled.
+    QString newScheme = ComboBoxSchemeconf->isEnabled()
+            ? ComboBoxSchemeconf->currentText()
+            : QString();
+
     if (m_colorScheme != newScheme) {
         m_colorScheme = newScheme;
         m_bRebootMixxxView = true;