Skip to content

Commit d3d69be

Browse files
committed
fix merge error
1 parent d0cb802 commit d3d69be

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private static ImageResult LoadInternal(string path, bool loadFullImage = false)
106106
{
107107
if (string.IsNullOrEmpty(path))
108108
{
109-
return new ImageResult(_imageCache[Constant.MissingImgIcon], ImageType.Error);
109+
return new ImageResult(ImageCache[Constant.MissingImgIcon], ImageType.Error);
110110
}
111111
if (ImageCache.ContainsKey(path))
112112
{
@@ -139,8 +139,8 @@ private static ImageResult LoadInternal(string path, bool loadFullImage = false)
139139
Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on first try", e);
140140
Log.Exception($"|ImageLoader.Load|Failed to get thumbnail for {path} on second try", e2);
141141

142-
ImageSource image = _imageCache[Constant.MissingImgIcon];
143-
_imageCache[path] = image;
142+
ImageSource image = ImageCache[Constant.MissingImgIcon];
143+
ImageCache[path] = image;
144144
imageResult = new ImageResult(image, ImageType.Error);
145145
}
146146
}
@@ -191,7 +191,7 @@ private static ImageResult GetThumbnailResult(ref string path, bool loadFullImag
191191
}
192192
else
193193
{
194-
image = _imageCache[Constant.MissingImgIcon];
194+
image = ImageCache[Constant.MissingImgIcon];
195195
path = Constant.MissingImgIcon;
196196
}
197197

0 commit comments

Comments
 (0)