Make sure themes are intact

Author: timothyschoen

Source/Dialogs/ThemeSettingsPanel.h

@@ -406,15 +406,20 @@ class ThemeSettingsPanel final : public SettingsDialogPanel
 
                 auto& selectedThemes = SettingsFile::getInstance()->getActiveThemes();
                 auto const& themeName = allThemes[result - 1];
+                auto currentTheme = SettingsFile::getInstance()->getProperty<String>("theme");
 
                 SettingsFile::getInstance()->getThemeTree().remove(result - 1);
                 if (selectedThemes[0].toString() == themeName) {
                     selectedThemes.set(0, "light");
                     PlugDataLook::selectedThemes.set(0, "light");
+                    if(themeName == currentTheme)
+                        SettingsFile::getInstance()->setProperty("theme", "light");
                 }
                 if (selectedThemes[1].toString() == themeName) {
                     selectedThemes.set(1, "dark");
                     PlugDataLook::selectedThemes.set(1, "dark");
+                    if(themeName == currentTheme)
+                        SettingsFile::getInstance()->setProperty("theme", "dark");
                 }
 
                 updateSwatches();

Source/LookAndFeel.cpp

@@ -1342,7 +1342,7 @@ void PlugDataLook::setTheme(DynamicObject::Ptr themeTree)
     UnorderedMap<PlugDataColour, Colour> colours;
 
     // Quick check if this tree is valid
-    if (!themeTree->hasProperty("name"))
+    if (!themeTree || !themeTree->hasProperty("name"))
         return;
 
     for (auto const& [colourId, colourNames] : PlugDataColourNames) {

Source/PluginProcessor.cpp

@@ -1591,14 +1591,11 @@ void PluginProcessor::setTheme(String themeToUse, bool const force)
     auto themeTree = settingsFile->getTheme(themeToUse);
     // Check if theme name is valid
     if (!themeTree) {
-        themeToUse = PlugDataLook::selectedThemes[0];
+        themeToUse = "light";
         themeTree = settingsFile->getTheme(themeToUse);
+        SettingsFile::getInstance()->setProperty("theme", themeToUse);
     }
 
-    // TODO: do we need this?
-    // if (!force && oldThemeTree && themeTree.isEquivalentTo(oldThemeTree))
-    //    return;
-
     lnf->setTheme(themeTree);
 
     updateAllEditorsLNF();

Source/Utility/SettingsFile.cpp

@@ -519,6 +519,20 @@ void SettingsFile::initialiseThemesTree()
     // Initialise selected themes tree
     auto selectedThemes = getActiveThemes();
     auto currentTheme = getProperty<String>("theme");
+
+    if(!getTheme(currentTheme))
+    {
+        currentTheme = "light";
+        setProperty("theme", selectedThemes[0].toString());
+    }
+    if(!getTheme(selectedThemes[0]))
+    {
+        selectedThemes.set(0, "light");
+    }
+    if(!getTheme(selectedThemes[1]))
+    {
+        selectedThemes.set(1, "dark");
+    }
     if (selectedThemes[0].toString() != currentTheme && selectedThemes[1].toString() != currentTheme) {
         setProperty("theme", selectedThemes[0].toString());
     }