This should fix #33

Author: BornToBeRoot

Source/NETworkManager/MainWindow.xaml.cs

@@ -42,6 +42,7 @@ private void OnPropertyChanged(string propertyName)
         private bool _isLoading = true;
 
         private bool _isInTray;
+        private bool _restartApplication;
         private bool _closeApplication;
 
         // Indicates a restart message, when settings changed
@@ -288,7 +289,7 @@ private void LoadApplicationList()
         private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
         {
             // Hide the application to tray
-            if (!_closeApplication && SettingsManager.Current.Window_MinimizeInsteadOfTerminating)
+            if (!_closeApplication && !_restartApplication && SettingsManager.Current.Window_MinimizeInsteadOfTerminating)
             {
                 e.Cancel = true;
 
@@ -298,7 +299,7 @@ private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
             }
 
             // Confirm close
-            if (!_closeApplication && SettingsManager.Current.Window_ConfirmClose)
+            if (!_closeApplication && !_restartApplication && SettingsManager.Current.Window_ConfirmClose)
             {
                 e.Cancel = true;
 
@@ -317,16 +318,8 @@ private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
                 return;
             }
 
-            // Save templates
-            if (TemplateManager.NetworkInterfaceConfigTemplatesChanged && !ImportExportManager.ForceRestart)
-                TemplateManager.SaveNetworkInterfaceConfigTemplates();
-
-            if (TemplateManager.WakeOnLANTemplatesChanged && !ImportExportManager.ForceRestart)
-                TemplateManager.SaveWakeOnLANTemplates();
-
-            // Save settings
-            if (SettingsManager.Current.SettingsChanged && !ImportExportManager.ForceRestart)
-                SettingsManager.Save();
+            if (!_restartApplication && !ImportExportManager.ForceRestart)
+                SaveTemplatesAndSettings();
 
             // Unregister HotKeys
             if (RegisteredHotKeys.Count > 0)
@@ -336,6 +329,20 @@ private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
             if (notifyIcon != null)
                 notifyIcon.Dispose();
         }
+
+        private void SaveTemplatesAndSettings()
+        {
+            // Save templates
+            if (TemplateManager.NetworkInterfaceConfigTemplatesChanged)
+                TemplateManager.SaveNetworkInterfaceConfigTemplates();
+
+            if (TemplateManager.WakeOnLANTemplatesChanged)
+                TemplateManager.SaveWakeOnLANTemplates();
+
+            // Save settings
+            if (SettingsManager.Current.SettingsChanged)
+                SettingsManager.Save();
+        }
         #endregion
 
         #region Application Views
@@ -727,9 +734,11 @@ private void CloseApplicationAction()
 
         private void RestartApplication()
         {
+            SaveTemplatesAndSettings();
+
             Process.Start(ConfigurationManager.Current.ApplicationFullName);
 
-            _closeApplication = true;
+            _restartApplication = true;
             Close();
         }