Resolves sourcechord#87

svr333 · Nov 20, 2021 · a8f88f7 · a8f88f7
1 parent 9acc251
commit a8f88f7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/FluentWPF/Utility/IconHelper.cs b/FluentWPF/Utility/IconHelper.cs
@@ -19,8 +19,10 @@ public static ImageSource AppIcon
             {
                 if (appIcon == null)
                 {
-                    var path = System.Reflection.Assembly.GetEntryAssembly().Location;
-                    appIcon = GetIcon(path);
+                    var assembly = System.Reflection.Assembly.GetEntryAssembly();
+                    assembly ??= System.Reflection.Assembly.GetCallingAssembly();
+
+                    appIcon = GetIcon(assembly.Location);
                 }
                 return appIcon;
             }