From 29f7dd93f3685ca7324d91f03c1d48a7b8e1fbce Mon Sep 17 00:00:00 2001
From: Faryan Rezagholi <faryan.rezagholi@siedle.de>
Date: Tue, 10 Aug 2021 00:56:14 +0200
Subject: [PATCH] optimized form closing event

---
 mRemoteNG/UI/Forms/frmMain.cs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs
index 36985c5bb..1b4552f57 100644
--- a/mRemoteNG/UI/Forms/frmMain.cs
+++ b/mRemoteNG/UI/Forms/frmMain.cs
@@ -407,6 +407,18 @@ namespace mRemoteNG.UI.Forms
 
         private void frmMain_FormClosing(object sender, FormClosingEventArgs e)
         {
+            if (Runtime.WindowList != null)
+            {
+                foreach (BaseWindow window in Runtime.WindowList)
+                {
+                    window.Close();
+                }
+            }
+
+            Hide();
+
+            IsClosing = true;
+
             if (Settings.Default.CloseToTray)
             {
                 if (Runtime.NotificationAreaIcon == null)
@@ -461,18 +473,8 @@ namespace mRemoteNG.UI.Forms
 
             Shutdown.Cleanup(_quickConnectToolStrip, _externalToolsToolStrip, _multiSshToolStrip, this);
 
-            IsClosing = true;
-
             Cef.Shutdown();
 
-            if (Runtime.WindowList != null)
-            {
-                foreach (BaseWindow window in Runtime.WindowList)
-                {
-                    window.Close();
-                }
-            }
-
             Shutdown.StartUpdate();
 
             Debug.Print("[END] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));