Fix issue MR-523 - Changes to external tools are not saved until exit…

…ing the program
mRemoteNG · Nov 18, 2013 · 7e94c6f · 7e94c6f
1 parent df44296
commit 7e94c6f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
@@ -9,6 +9,7 @@
   Made improvement MR-486 - Allow escaping of variable names for external tools
   Made improvement MR-590 - Make panels docked to the edge of the window keep their size
   Fixed issue MR-187 - F7 keyboard shortcut for New Folder conflicts with remote connections
+  Fixed issue MR-523 - Changes to external tools are not saved until exiting the program
   Fixed issue MR-556 - Export fails when overwriting an existing file
   Fixed issue MR-594 - Crash on startup if write access is denied to the IE browser emulation registry key
   Fixed issue MR-603 - Some configuration options are still shown even when inheritance is enabled

diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
@@ -716,8 +716,7 @@ Namespace App
 
                     If My.Settings.SaveConsOnExit Then SaveConnections()
 
-                    Dim saveSettings As New Settings.Save()
-                    saveSettings.Save()
+                    Settings.Save.Save()
 
                     IeBrowserEmulation.Unregister()
                 Catch ex As Exception

diff --git a/mRemoteV1/Config/Config.Settings.Save.vb b/mRemoteV1/Config/Config.Settings.Save.vb
@@ -6,7 +6,7 @@ Namespace Config
     Namespace Settings
         Public Class Save
 #Region "Public Methods"
-            Public Sub Save()
+            Public Shared Sub Save()
                 Try
                     With frmMain
                         Dim windowPlacement As New Tools.WindowPlacement(frmMain)
@@ -50,14 +50,14 @@ Namespace Config
                         My.Settings.Save()
                     End With
 
-                    Me.SavePanelsToXML()
-                    Me.SaveExternalAppsToXML()
+                    SavePanelsToXML()
+                    SaveExternalAppsToXML()
                 Catch ex As Exception
                     MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 
-            Public Sub SavePanelsToXML()
+            Public Shared Sub SavePanelsToXML()
                 Try
                     If Directory.Exists(App.Info.Settings.SettingsPath) = False Then
                         Directory.CreateDirectory(App.Info.Settings.SettingsPath)
@@ -69,7 +69,7 @@ Namespace Config
                 End Try
             End Sub
 
-            Public Sub SaveExternalAppsToXML()
+            Public Shared Sub SaveExternalAppsToXML()
                 Try
                     If Directory.Exists(App.Info.Settings.SettingsPath) = False Then
                         Directory.CreateDirectory(App.Info.Settings.SettingsPath)

diff --git a/mRemoteV1/UI/UI.Window.ExternalApps.vb b/mRemoteV1/UI/UI.Window.ExternalApps.vb
@@ -424,6 +424,10 @@ Namespace UI
                 LoadApps()
             End Sub
 
+            Private Shared Sub ExternalApps_FormClosed(sender As System.Object, e As FormClosedEventArgs) Handles MyBase.FormClosed
+                mRemoteNG.Config.Settings.Save.SaveExternalAppsToXML()
+            End Sub
+
             Private Sub ApplyLanguage()
                 clmDisplayName.Text = My.Language.strColumnDisplayName
                 clmFilename.Text = My.Language.strColumnFilename