From 6ca98149a71f7ccb53f881c055904d00a8838713 Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Thu, 2 Jun 2016 15:21:30 -0600
Subject: [PATCH] Made Startup slightly less static

---
 mRemoteV1/App/ProgramRoot.cs |  2 +-
 mRemoteV1/App/Startup.cs     | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mRemoteV1/App/ProgramRoot.cs b/mRemoteV1/App/ProgramRoot.cs
index 4d3af29f7..c6283081b 100644
--- a/mRemoteV1/App/ProgramRoot.cs
+++ b/mRemoteV1/App/ProgramRoot.cs
@@ -24,7 +24,7 @@ namespace mRemoteNG.App
 
         private static void StartApplication()
         {
-            Startup.InitializeProgram();
+            Startup.Instance.InitializeProgram();
             Application.Run(frmMain.Default);
         }
 
diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs
index 4ad9b8d80..c2b5a4405 100644
--- a/mRemoteV1/App/Startup.cs
+++ b/mRemoteV1/App/Startup.cs
@@ -26,6 +26,11 @@ namespace mRemoteNG.App
         private static readonly Startup _singletonInstance = new Startup();
         private AppUpdater _appUpdate;
 
+        public static Startup Instance
+        {
+            get { return _singletonInstance; }
+        }
+
         private Startup()
         {
             _appUpdate = new AppUpdater();
@@ -35,14 +40,14 @@ namespace mRemoteNG.App
         {
         }
 
-        public static void InitializeProgram()
+        public void InitializeProgram()
         {
             Debug.Print("---------------------------" + Environment.NewLine + "[START] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));
-            _singletonInstance.LogStartupData();
             //CheckCompatibility();
-            _singletonInstance.ParseCommandLineArgs();
+            LogStartupData();
+            ParseCommandLineArgs();
             IeBrowserEmulation.Register();
-            _singletonInstance.GetConnectionIcons();
+            GetConnectionIcons();
         }
 
         private void CheckCompatibility()