From 153ddd46aafb5ab5a3f138f309cfe9af07b30e67 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 20 Jul 2010 15:10:08 +0000 Subject: [PATCH] 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 --- src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs b/src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs index e31d4f8ea4..4e68a8d69a 100644 --- a/src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs +++ b/src/Main/ICSharpCode.Core.Presentation/GlobalStyles.cs @@ -15,17 +15,17 @@ namespace ICSharpCode.Core.Presentation /// 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");