Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

when both icopath and icon delegdate are empty\null it will raise an exception.

Browse Source 
currently delegate is verified and an error icon will be presented (same as before) but without raising an excpetion.
This commit is contained in:
AT
2019-11-09 11:55:53 +02:00
parent d818a15aea
commit ed59d6acf5
1 changed files with 7 additions and 6 deletions
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.Windows.Media;
using System.Windows.Threading;
using Wox.Infrastructure;
using Wox.Infrastructure.Image;
using Wox.Infrastructure.Logger;
using Wox.Plugin;
@@ -22,7 +23,8 @@ namespace Wox.ViewModel
{
get
{
if (string.IsNullOrEmpty(Result.IcoPath))
var imagePath = Result.IcoPath;
if (string.IsNullOrEmpty(imagePath) && Result.Icon != null)
{
try
{
@@ -31,13 +33,12 @@ namespace Wox.ViewModel
catch (Exception 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
{
return ImageLoader.Load(Result.IcoPath);
}
// will get here either when icoPath has value\icon delegate is null\when had exception in delegate
return ImageLoader.Load(imagePath);
}
}