From c2d2fc00922ba0ba8912b6133d1b0489f89269d6 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Fri, 2 Sep 2022 08:36:07 -0400 Subject: [PATCH] Fix caching --- .../Image/ImageLoader.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs index 3c5c8b9b6..ef034e194 100644 --- a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs +++ b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs @@ -110,9 +110,9 @@ namespace Flow.Launcher.Infrastructure.Image { return new ImageResult(ImageCache[Constant.MissingImgIcon], ImageType.Error); } - if (loadFullImage && ImageCache.ContainsKey(path + ImageType.FullImageFile)) + if (loadFullImage && ImageCache.ContainsKey($"{path}_{ImageType.FullImageFile}")) { - return new ImageResult(ImageCache[path + ImageType.FullImageFile], ImageType.Cache); + return new ImageResult(ImageCache[$"{path}_{ImageType.FullImageFile}"], ImageType.Cache); } if (!loadFullImage && ImageCache.ContainsKey(path)) { @@ -223,7 +223,7 @@ namespace Flow.Launcher.Infrastructure.Image { if (fullImage) { - return ImageCache.ContainsKey(path + ImageType.FullImageFile); + return ImageCache.ContainsKey($"{path}_{ImageType.FullImageFile}"); } return ImageCache.ContainsKey(path) && ImageCache[path] != null; } @@ -236,7 +236,10 @@ namespace Flow.Launcher.Infrastructure.Image if (imageResult.ImageType != ImageType.Error && imageResult.ImageType != ImageType.Cache) { // we need to get image hash string hash = EnableImageHash ? _hashGenerator.GetHashFromImage(img) : null; - + if (imageResult.ImageType == ImageType.FullImageFile) + { + path = $"{path}_{ImageType.FullImageFile}"; + } if (hash != null) { @@ -246,10 +249,7 @@ namespace Flow.Launcher.Infrastructure.Image } else { // new guid - if (imageResult.ImageType == ImageType.FullImageFile) - { - path = path + ImageType.FullImageFile; - } + GuidToKey[hash] = path; } }