From 0466f4fc15db6299c28234ca24358584369b03de Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Mon, 18 Sep 2006 17:33:05 +0000
Subject: [PATCH] Fixed SD2-981 - Running SharpDevelop using nologo command
 line argument throws invalid operation exception.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1819 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 src/Main/StartUp/Project/Dialogs/SplashScreen.cs | 9 ++++++---
 src/Main/StartUp/Project/SharpDevelopMain.cs     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Main/StartUp/Project/Dialogs/SplashScreen.cs b/src/Main/StartUp/Project/Dialogs/SplashScreen.cs
index 0f05cf9022..80107de02a 100644
--- a/src/Main/StartUp/Project/Dialogs/SplashScreen.cs
+++ b/src/Main/StartUp/Project/Dialogs/SplashScreen.cs
@@ -26,9 +26,6 @@ namespace ICSharpCode.SharpDevelop
 		
 		public static SplashScreenForm SplashScreen {
 			get {
-				if (splashScreen == null) {
-					splashScreen = new SplashScreenForm();
-				}
 				return splashScreen;
 			}
 		}
@@ -57,6 +54,12 @@ namespace ICSharpCode.SharpDevelop
 			BackgroundImage = bitmap;
 		}
 		
+		public static void ShowSplashScreen()
+		{
+			splashScreen = new SplashScreenForm();
+			splashScreen.Show();
+		}
+		
 		protected override void Dispose(bool disposing)
 		{
 			if (disposing) {
diff --git a/src/Main/StartUp/Project/SharpDevelopMain.cs b/src/Main/StartUp/Project/SharpDevelopMain.cs
index 8e197d7416..84085da4be 100644
--- a/src/Main/StartUp/Project/SharpDevelopMain.cs
+++ b/src/Main/StartUp/Project/SharpDevelopMain.cs
@@ -91,7 +91,7 @@ namespace ICSharpCode.SharpDevelop
 			}
 			
 			if (!noLogo) {
-				SplashScreenForm.SplashScreen.Show();
+				SplashScreenForm.ShowSplashScreen();
 			}
 			try {
 				RunApplication();