Prevent crash if custom icon is deleted from disk

timokoessler · Apr 23, 2024 · 7280e07 · 7280e07
1 parent acc29c8
commit 7280e07
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/Guard/Views/Controls/TokenCard.xaml.cs b/Guard/Views/Controls/TokenCard.xaml.cs
@@ -67,21 +67,29 @@ internal TokenCard(TOTPTokenHelper token)
                 }
                 else
                 {
-                    if (icon.Path != null && icon.Path.AbsolutePath.EndsWith(".svg"))
+                    if (icon.Path != null && File.Exists(icon.Path.AbsolutePath))
                     {
-                        SvgIconView.Source = icon.Path;
+                        if (icon.Path.AbsolutePath.EndsWith(".svg"))
+                        {
+                            SvgIconView.Source = icon.Path;
+                        }
+                        else
+                        {
+                            ImageIconView.Visibility = Visibility.Visible;
+                            SvgIconView.Visibility = Visibility.Collapsed;
+
+                            var bitmap = new BitmapImage();
+                            bitmap.BeginInit();
+                            bitmap.CacheOption = BitmapCacheOption.OnLoad;
+                            bitmap.UriSource = icon.Path;
+                            bitmap.EndInit();
+                            ImageIconView.Source = bitmap;
+                        }
                     }
                     else
                     {
-                        ImageIconView.Visibility = Visibility.Visible;
-                        SvgIconView.Visibility = Visibility.Collapsed;
-
-                        var bitmap = new BitmapImage();
-                        bitmap.BeginInit();
-                        bitmap.CacheOption = BitmapCacheOption.OnLoad;
-                        bitmap.UriSource = icon.Path;
-                        bitmap.EndInit();
-                        ImageIconView.Source = bitmap;
+                        icon = IconManager.GetIcon("default", IconManager.IconType.Default);
+                        SvgIconView.SvgSource = icon.Svg;
                     }
                 }
             }