Skip to content

Fix get icon #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix get icon #156

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8f88f7
Resolves #87
svr333 Nov 20, 2021
dd409a6
Remove unused usings
svr333 Nov 20, 2021
51ae676
Use ExecutingAssembly over CallingAssembly
svr333 Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions FluentWPF/Utility/IconHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
Expand All @@ -19,8 +15,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.GetExecutingAssembly();

appIcon = GetIcon(assembly.Location);
}
return appIcon;
}
Expand Down