Browse Source

Fix bug in global styles that caused crash on startup.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6157 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 15 years ago
parent
commit
153ddd46aa
  1. 10
      src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs

10
src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs

@ -15,17 +15,17 @@ namespace ICSharpCode.Core.Presentation @@ -15,17 +15,17 @@ namespace ICSharpCode.Core.Presentation
/// </summary>
public static class GlobalStyles
{
public static Style WindowStyle {
get { return FindResource(windowStyleKey); }
}
static Style FindResource(ResourceKey key)
{
// don't crash if controls using GlobalStyles are instanciated in unit test mode
if (Application.Current == null)
return null;
else
return (Style)Application.Current.FindResource(WindowStyleKey);
return (Style)Application.Current.FindResource(key);
}
public static Style WindowStyle {
get { return FindResource(windowStyleKey); }
}
static readonly ResourceKey windowStyleKey = new ComponentResourceKey(typeof(GlobalStyles), "WindowStyle");

Loading…
Cancel
Save