Skip to content

fix: prevent TypeInitializationException crash #1808

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
DineshSolanki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent TypeInitializationException crash #1808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/Shared/HandyControl_Shared/Controls/Window/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@ public class Window : System.Windows.Window

static Window()
{
StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(ResourceHelper.GetResourceInternal<Style>(ResourceToken.WindowWin10)));
try
{
StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(ResourceHelper.GetResourceInternal<Style>(ResourceToken.WindowWin10)));
}
catch
{
StyleProperty.OverrideMetadata(typeof(Window), new FrameworkPropertyMetadata(null));
}
}

public Window()
Expand Down
12 changes: 10 additions & 2 deletions src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace HandyControl.Tools;
/// </summary>
public class ResourceHelper
{
private static readonly Lazy<ResourceDictionary> _themeLazy = new(GetStandaloneTheme);

private static ResourceDictionary _theme;

/// <summary>
Expand All @@ -29,11 +31,17 @@ public static T GetResource<T>(string key)

internal static T GetResourceInternal<T>(string key)
{
if (GetTheme()[key] is T resource)
var theme = GetTheme();
if (theme != null && theme[key] is T resource)
{
return resource;
}

if (Application.Current != null && Application.Current.TryFindResource(key) is T appResource)
{
return appResource;
}

return default;
}

Expand Down Expand Up @@ -72,7 +80,7 @@ public static ResourceDictionary GetSkin(Assembly assembly, string themePath, Sk
/// <summary>
/// get HandyControl theme
/// </summary>
public static ResourceDictionary GetTheme() => _theme ??= GetStandaloneTheme();
public static ResourceDictionary GetTheme() => _theme ??= _themeLazy.Value;

public static ResourceDictionary GetStandaloneTheme()
{
Expand Down