From 03ecbee5f9b507f7bdc0c8f43d72b8b70666e476 Mon Sep 17 00:00:00 2001
From: Caeden Statia <caeden.s@outlook.com>
Date: Sat, 22 Feb 2020 21:00:39 -0800
Subject: [PATCH] Falls back to Light theme if loaded theme does not include
 some elements.

---
 ModAssistant/App.xaml          | 8 ++++++--
 ModAssistant/Classes/Themes.cs | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ModAssistant/App.xaml b/ModAssistant/App.xaml
index ed8c11d..97dcbf3 100644
--- a/ModAssistant/App.xaml
+++ b/ModAssistant/App.xaml
@@ -13,8 +13,12 @@
 
                 <!-- Load default sidebar theme, in case LoadedTheme doesn't have Sidebar properties applied. -->
                 <ResourceDictionary x:Name="DefaultSidebarTheme" Source="Themes/Default_Sidebar.xaml"/>
-                
-                <!-- Load default theme. Currently it's Dark, not sure if you want to change it to Light. -->
+
+                <!-- Load default theme, in case the LoadedTheme does not include any visual elements for some controls.
+                     If someone tried to load a completely empty theme, it will "fall back" to Light theme.-->
+                <ResourceDictionary x:Name="DefaultTheme" Source="Themes/Light.xaml"/>
+
+                <!-- Load theme to be modified via the Theme engine. -->
                 <ResourceDictionary x:Name="LoadedTheme" Source="Themes/Dark.xaml"/>
 
                 <!-- Load SVG icons, courtesy of lolPants. -->
diff --git a/ModAssistant/Classes/Themes.cs b/ModAssistant/Classes/Themes.cs
index 4c9c177..1f108d5 100644
--- a/ModAssistant/Classes/Themes.cs
+++ b/ModAssistant/Classes/Themes.cs
@@ -23,7 +23,7 @@ namespace ModAssistant
         private static Dictionary<string, Theme> loadedThemes = new Dictionary<string, Theme>();
         private static List<string> preInstalledThemes = new List<string> { "Light", "Dark", "Light Pink" }; //These themes will always be available to use.
 
-        private static readonly int LOADEDTHEME_INDEX = 3;
+        private static readonly int LOADEDTHEME_INDEX = 4;
 
         /// <summary>
         /// Load all themes from local Themes subfolder and from embedded resources.