load error icon using cache

Wox-launcher · May 15, 2020 · b340d7e · b340d7e
1 parent c5e3115
commit b340d7e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/Wox/Image/ImageLoader.cs b/Wox/Image/ImageLoader.cs
@@ -93,12 +93,11 @@ private static ImageSource LoadInternal(string path)
             bool imageInsideWoxDirectory = IsSubdirectory(parent1, subPath) || IsSubdirectory(parent2, subPath);
             if (normalImage && imageInsideWoxDirectory)
             {
-                var bitmapImage = new BitmapImage(new Uri(path))
+                image = new BitmapImage(new Uri(path))
                 {
                     DecodePixelHeight = 32,
                     DecodePixelWidth = 32
                 };
-                image = bitmapImage;
                 image.Freeze();
                 return image;
             }
@@ -159,10 +158,16 @@ private static ImageSource LoadInternal(string path)
 
         private static ImageSource GetErrorImage()
         {
-            ShellFile shellFile = ShellFile.FromFilePath(Constant.ErrorIcon);
-            // small is (32, 32), refer comment above
-            ImageSource image = shellFile.Thumbnail.SmallBitmapSource;
-            image.Freeze();
+            ImageSource image = _cache.GetOrAdd(Constant.ErrorIcon, (_) =>
+            {
+                BitmapImage bitmap = new BitmapImage(new Uri(Constant.ErrorIcon))
+                {
+                    DecodePixelHeight = 32,
+                    DecodePixelWidth = 32
+                };
+                bitmap.Freeze();
+                return bitmap;
+            });
             return image;
         }