From e4e2f50015288ecce1c2d2a260963d837ebe8a9e Mon Sep 17 00:00:00 2001
From: Pedro Rodrigues <prodrigues1990@gmail.com>
Date: Fri, 15 Sep 2017 20:38:34 +0100
Subject: [PATCH] Saving settings before exiting, and avoid early return

---
 mRemoteV1/App/Startup.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs
index 97daa0849..eda111031 100644
--- a/mRemoteV1/App/Startup.cs
+++ b/mRemoteV1/App/Startup.cs
@@ -312,11 +312,7 @@ namespace mRemoteNG.App
                 // Handle custom connection file location
                 Settings.Default.CustomConsPath = GetCustomConsPath(ConsParam);
                 if (Settings.Default.CustomConsPath != null)
-                {
                     Settings.Default.LoadConsFromCustomLocation = true;
-                    Settings.Default.Save();
-                    return;
-                }
 
                 if (!string.IsNullOrEmpty(ResetPosParam))
                 {
@@ -340,6 +336,8 @@ namespace mRemoteNG.App
                 {
                     Settings.Default.ResetToolbars = true;
                 }
+
+                Settings.Default.Save();
             }
             catch (Exception ex)
             {