prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #72 from theClueless/upstreamdev

Browse source 
Fix bug throwing exception for IcoPath null
This commit is contained in:
Jeremy Wu 2019-11-10 17:00:12 +11:00 committed by GitHub
commit e1fc11218f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Wox/ViewModel/ResultViewModel.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Threading; using System.Windows.Threading;
using Wox.Infrastructure;
using Wox.Infrastructure.Image; using Wox.Infrastructure.Image;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Plugin; using Wox.Plugin;
@ -22,7 +23,8 @@ namespace Wox.ViewModel
{ {
get get
{ {
if (string.IsNullOrEmpty(Result.IcoPath)) var imagePath = Result.IcoPath;
if (string.IsNullOrEmpty(imagePath) && Result.Icon != null)
{ {
try try
{ {
@ -31,13 +33,12 @@ namespace Wox.ViewModel
catch (Exception e) catch (Exception e)
{ {
Log.Exception($"|ResultViewModel.Image|IcoPath is empty and exception when calling Icon() for result <{Result.Title}> of plugin <{Result.PluginDirectory}>", e); Log.Exception($"|ResultViewModel.Image|IcoPath is empty and exception when calling Icon() for result <{Result.Title}> of plugin <{Result.PluginDirectory}>", e);
return ImageLoader.Load(Result.IcoPath); imagePath = Constant.ErrorIcon;
} }
} }
else
{ // will get here either when icoPath has value\icon delegate is null\when had exception in delegate
return ImageLoader.Load(Result.IcoPath); return ImageLoader.Load(imagePath);
}
} }
} }