Log and catch more exception when changing themes

Jack251970 · Jack251970 · commit dc3d2be59d56 · 2025-10-03T09:22:55.000+08:00
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -449,9 +449,19 @@ public bool ChangeTheme(string theme = null)
                 }
                 return false;
             }
-            catch (XamlParseException)
+            catch (XamlParseException e)
             {
-                _api.LogError(ClassName, $"Theme <{theme}> fail to parse");
+                _api.LogException(ClassName, $"Theme <{theme}> fail to parse xaml", e);
+                if (theme != Constant.DefaultTheme)
+                {
+                    _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));
+                    ChangeTheme(Constant.DefaultTheme);
+                }
+                return false;
+            }
+            catch (Exception e)
+            {
+                _api.LogException(ClassName, $"Theme <{theme}> fail to load", e);
                 if (theme != Constant.DefaultTheme)
                 {
                     _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));

Original file line number	Diff line number	Diff line change
`@@ -449,9 +449,19 @@ public bool ChangeTheme(string theme = null)`
`449`	`449`	`}`
`450`	`450`	`return false;`
`451`	`451`	`}`
`452`		`- catch (XamlParseException)`
	`452`	`+ catch (XamlParseException e)`
`453`	`453`	`{`
`454`		`- _api.LogError(ClassName, $"Theme <{theme}> fail to parse");`
	`454`	`+ _api.LogException(ClassName, $"Theme <{theme}> fail to parse xaml", e);`
	`455`	`+ if (theme != Constant.DefaultTheme)`
	`456`	`+ {`
	`457`	`+ _api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));`
	`458`	`+ ChangeTheme(Constant.DefaultTheme);`
	`459`	`+ }`
	`460`	`+ return false;`
	`461`	`+ }`
	`462`	`+ catch (Exception e)`
	`463`	`+ {`
	`464`	`+ _api.LogException(ClassName, $"Theme <{theme}> fail to load", e);`
`455`	`465`	`if (theme != Constant.DefaultTheme)`
`456`	`466`	`{`
`457`	`467`	`_api.ShowMsgBox(Localize.theme_load_failure_parse_error(theme));`