Pushed null-check into icon extraction function.

Wizzergod · Aug 28, 2017 · 3ef1aa7 · 3ef1aa7
1 parent 8340d85
commit 3ef1aa7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Common/Helpers/FirewallHelper.cs b/Common/Helpers/FirewallHelper.cs
@@ -71,8 +71,7 @@ public ImageSource Icon
                 {
                     if (_icon == null)
                     {
-						//Some apps (Ahem, IE) may create a rule where the ApplicationName is null. Supplement an empty string in case.
-                        _icon = IconHelper.GetIcon(this.ApplicationName == null ? "" : this.ApplicationName); //FIXME: This is now expanded... Is that a problem?!?
+                        _icon = IconHelper.GetIcon(this.ApplicationName); //FIXME: This is now expanded... Is that a problem?!?
                     }
 
                     return _icon;

diff --git a/Common/Helpers/IconHelper.cs b/Common/Helpers/IconHelper.cs
@@ -20,6 +20,10 @@ public class IconHelper
         private static BitmapSource GetIconFromPath(string path, bool defaultIfNotFound = false)
         {
             Icon ic = null;
+            if (String.IsNullOrEmpty(path))
+            {
+                path = "?error";
+            }
             switch (path)
             {
                 case "System":