Fix crash when resource not found

srwi · Dec 19, 2020 · 2d33df2 · 2d33df2
1 parent 14e0bfa
commit 2d33df2
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git a/EverythingToolbar/Helpers/ApplicationResources.cs b/EverythingToolbar/Helpers/ApplicationResources.cs
@@ -34,6 +34,12 @@ public void AddResource(ResourceDictionary resource)
 
 		public void AddResource(string path)
 		{
+			if (!File.Exists(path))
+			{
+				ToolbarLogger.GetLogger("EverythingToolbar").Error("Could not find resource file " + path);
+				return;
+			}
+
 			ResourceChanged?.Invoke(this, new ResourcesChangedEventArgs()
 			{
 				NewResource = new ResourceDictionary() { Source = new Uri(path) }
@@ -44,27 +50,13 @@ public void ApplyTheme(string themeName)
 		{
 			string assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 			string themePath = Path.Combine(assemblyFolder, "Themes", themeName + ".xaml");
-
-			if (!File.Exists(themePath))
-			{
-				ToolbarLogger.GetLogger("EverythingToolbar").Error("Theme file not found. Defaulting to 'Medium' theme.");
-				themePath = Path.Combine(assemblyFolder, "Themes", "Medium.xaml");
-			}
-
 			AddResource(themePath);
 		}
 
 		public void ApplyItemTemplate(string templateName)
 		{
 			string assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 			string templatePath = Path.Combine(assemblyFolder, "ItemTemplates", templateName + ".xaml");
-
-			if (!File.Exists(templatePath))
-			{
-				ToolbarLogger.GetLogger("EverythingToolbar").Error("Item template file not found. Defaulting to 'Normal' template.");
-				templatePath = Path.Combine(assemblyFolder, "ItemTemplates", "Normal.xaml");
-			}
-
 			AddResource(templatePath);
 		}
 	}

diff --git a/EverythingToolbar/Properties/AssemblyInfo.cs b/EverythingToolbar/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.2")]
+[assembly: AssemblyVersion("0.6.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/EverythingToolbar/Properties/Settings.Designer.cs b/EverythingToolbar/Properties/Settings.Designer.cs
diff --git a/EverythingToolbar/Properties/Settings.settings b/EverythingToolbar/Properties/Settings.settings
@@ -24,10 +24,10 @@
       <Value Profile="(Default)">C:\\Program Files\\Everything\\Everything.exe</Value>
     </Setting>
     <Setting Name="theme" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">Medium</Value>
     </Setting>
     <Setting Name="itemTemplate" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">Normal</Value>
     </Setting>
     <Setting Name="isAutoApplyRules" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>

diff --git a/EverythingToolbar/Rules.xaml.cs b/EverythingToolbar/Rules.xaml.cs
@@ -155,6 +155,9 @@ private void CheckBox_Click(object sender, RoutedEventArgs e)
 
 		public static bool HandleRule(SearchResult searchResult, string command="")
 		{
+			if (searchResult == null)
+				return false;
+
 			if (Properties.Settings.Default.isAutoApplyRules && string.IsNullOrEmpty(command))
 			{
 				foreach (Rule r in LoadRules())

diff --git a/EverythingToolbar/ToolbarControl.xaml.cs b/EverythingToolbar/ToolbarControl.xaml.cs
@@ -24,7 +24,7 @@ public ToolbarControl()
 				}
 				catch (Exception ex)
 				{
-					ToolbarLogger.GetLogger("EverythingToolbar").Error(ex, "Failed to apply resources.");
+					ToolbarLogger.GetLogger("EverythingToolbar").Error(ex, "Failed to apply resource.");
 				}
 			};
 			ApplicationResources.Instance.LoadDefaults();

diff --git a/EverythingToolbar/app.config b/EverythingToolbar/app.config
@@ -29,10 +29,10 @@
                 <value>C:\\Program Files\\Everything\\Everything.exe</value>
             </setting>
             <setting name="theme" serializeAs="String">
-                <value />
+                <value>Medium</value>
             </setting>
             <setting name="itemTemplate" serializeAs="String">
-                <value />
+                <value>Normal</value>
             </setting>
             <setting name="isAutoApplyRules" serializeAs="String">
                 <value>False</value>