Make loading custom XAML safer

2025-12-16 19:24:41 +00:00 · 2021-06-30 16:06:09 -07:00
parent cfb2d316d7
commit afa064e429
1 changed files with 10 additions and 3 deletions
--- a/RedBookPlayer/GUI/PlayerView.xaml.cs
+++ b/RedBookPlayer/GUI/PlayerView.xaml.cs
@@ -117,10 +117,17 @@ namespace RedBookPlayer.GUI
            DataContext = new PlayerViewModel();

            // Load the theme
-            if (xaml != null)
-                new AvaloniaXamlLoader().Load(xaml, null, this);
-            else
+            try
+            {
+                if(xaml != null)
+                    new AvaloniaXamlLoader().Load(xaml, null, this);
+                else
+                    AvaloniaXamlLoader.Load(this);
+            }
+            catch
+            {
                AvaloniaXamlLoader.Load(this);
+            }

            InitializeDigits();