From 06ce840a8f160ccadbb9cf3926fc23e41a7c2ba6 Mon Sep 17 00:00:00 2001
From: David Sparer <sparerd@gmail.com>
Date: Sun, 22 May 2016 10:48:29 -0600
Subject: [PATCH] Moved GetConnectionIcons call from frmMain to Startup

---
 mRemoteV1/App/Startup.cs      | 3 ++-
 mRemoteV1/UI/Forms/frmMain.cs | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs
index 0778069b9..951303763 100644
--- a/mRemoteV1/App/Startup.cs
+++ b/mRemoteV1/App/Startup.cs
@@ -41,6 +41,7 @@ namespace mRemoteNG.App
             //CheckCompatibility();
             _singletonInstance.ParseCommandLineArgs();
             IeBrowserEmulation.Register();
+            _singletonInstance.GetConnectionIcons();
         }
 
         private void CheckCompatibility()
@@ -126,7 +127,7 @@ namespace mRemoteNG.App
 
             frmMain.Default.pnlDock.Visible = true;
         }
-        public static void GetConnectionIcons()
+        private void GetConnectionIcons()
         {
             string iPath = (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.DirectoryPath + "\\Icons\\";
             if (Directory.Exists(iPath) == false)
diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs
index 3c810c841..2721822a9 100644
--- a/mRemoteV1/UI/Forms/frmMain.cs
+++ b/mRemoteV1/UI/Forms/frmMain.cs
@@ -163,8 +163,6 @@ namespace mRemoteNG.UI.Forms
             Runtime.MessageCollector = new MessageCollector(Windows.errorsForm);
             Runtime.WindowList = new WindowList();
 
-            
-            Startup.GetConnectionIcons();
             Windows.treePanel.Focus();
             ConnectionTree.TreeView = Windows.treeForm.tvConnections;