Close #48 - I hope it works

Author: BornToBeRoot

Source/NETworkManager/ViewModels/Settings/SettingsGeneralImportExportViewModel.cs

@@ -253,15 +253,6 @@ public bool ExportWakeOnLANClients
         public SettingsGeneralImportExportViewModel(IDialogCoordinator instance)
         {
             dialogCoordinator = instance;
-
-            CheckFilesExist();
-        }
-
-        private void CheckFilesExist()
-        {
-            ApplicationSettingsExists = File.Exists(SettingsManager.GetSettingsFilePath());
-            NetworkInterfaceProfilesExists = File.Exists(NetworkInterfaceProfileManager.GetProfilesFilePath());
-            WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());
         }
         #endregion
 
@@ -378,35 +369,14 @@ private async void ExportSettingsAction()
             List<ImportExportManager.ImportExportOptions> exportOptions = new List<ImportExportManager.ImportExportOptions>();
 
             if (ApplicationSettingsExists && (ExportEverything || ExportApplicationSettings))
-            {
-                // Save them, before export
-                if (SettingsManager.Current.SettingsChanged)
-                    SettingsManager.Save();
-
-                // Add to export
                 exportOptions.Add(ImportExportManager.ImportExportOptions.ApplicationSettings);
-            }
-
+            
             if (NetworkInterfaceProfilesExists && (ExportEverything || ExportNetworkInterfaceProfiles))
-            {
-                // Save them, before export
-                if (NetworkInterfaceProfileManager.ProfilesChanged)
-                    NetworkInterfaceProfileManager.Save();
-
-                // Add to export
                 exportOptions.Add(ImportExportManager.ImportExportOptions.NetworkInterfaceProfiles);
-            }
 
             if (WakeOnLANClientsExists && (ExportEverything || ExportWakeOnLANClients))
-            {
-                // Save them, before export
-                if (WakeOnLANClientManager.ClientsChanged)
-                    WakeOnLANClientManager.Save();
-
-                // Add to export
                 exportOptions.Add(ImportExportManager.ImportExportOptions.WakeOnLANClients);
-            }
-            
+
             System.Windows.Forms.SaveFileDialog saveFileDialog = new System.Windows.Forms.SaveFileDialog()
             {
                 Filter = ImportExportFileExtensionFilter,
@@ -424,6 +394,26 @@ private async void ExportSettingsAction()
                 await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_Success"] as string, string.Format("{0}\n\n{1}: {2}", Application.Current.Resources["String_SettingsSuccessfullyExported"] as string, Application.Current.Resources["String_Path"] as string, saveFileDialog.FileName), MessageDialogStyle.Affirmative, settings);
             }
         }
+        #endregion
+
+        #region Methods
+        public void SaveAndCheckSettings()
+        {
+            // Save everything
+            if (SettingsManager.Current.SettingsChanged)
+                SettingsManager.Save();
+
+            if (NetworkInterfaceProfileManager.ProfilesChanged)
+                NetworkInterfaceProfileManager.Save();
+
+            if (WakeOnLANClientManager.ClientsChanged)
+                WakeOnLANClientManager.Save();
+
+            // Check if files exist
+            ApplicationSettingsExists = File.Exists(SettingsManager.GetSettingsFilePath());
+            NetworkInterfaceProfilesExists = File.Exists(NetworkInterfaceProfileManager.GetProfilesFilePath());
+            WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());
+        }
+        #endregion
     }
-    #endregion
 }

Source/NETworkManager/ViewModels/Settings/SettingsGeneralSettingsViewModel.cs

@@ -335,6 +335,24 @@ private async void MakePortable(bool isPortable)
 
             MakingPortable = false;
         }
+
+        public void SaveAndCheckSettings()
+        {
+            // Save everything
+            if (SettingsManager.Current.SettingsChanged)
+                SettingsManager.Save();
+
+            if (NetworkInterfaceProfileManager.ProfilesChanged)
+                NetworkInterfaceProfileManager.Save();
+
+            if (WakeOnLANClientManager.ClientsChanged)
+                WakeOnLANClientManager.Save();
+
+            // Check if files exist
+            ApplicationSettingsExists = File.Exists(SettingsManager.GetSettingsFilePath());
+            NetworkInterfaceProfilesExists = File.Exists(NetworkInterfaceProfileManager.GetProfilesFilePath());
+            WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());
+        }
         #endregion
     }
 }

Source/NETworkManager/ViewModels/Settings/SettingsViewModel.cs

@@ -150,18 +150,24 @@ private void ChangeSettingsContent(SettingsViewInfo settingsViewInfo)
                     if (_settingsGeneralSettingsView == null)
                         _settingsGeneralSettingsView = new SettingsGeneralSettingsView();
 
+                    // Save settings (if changed) and check if files exists
+                    _settingsGeneralSettingsView.SaveAndCheckSettings();
+
                     SettingsContent = _settingsGeneralSettingsView;
                     break;
                 case SettingsViewManager.Name.ImportExport:
                     if (_settingsGeneralImportExportView == null)
                         _settingsGeneralImportExportView = new SettingsGeneralImportExportView();
 
+                    // Save settings (if changed) and check if files exists
+                    _settingsGeneralImportExportView.SaveAndCheckSettings();
+
                     SettingsContent = _settingsGeneralImportExportView;
                     break;
                 case SettingsViewManager.Name.IPScanner:
                     if (_settingsApplicationIPScannerView == null)
                         _settingsApplicationIPScannerView = new SettingsApplicationIPScannerView();
-
+                                        
                     SettingsContent = _settingsApplicationIPScannerView;
                     break;
                 case SettingsViewManager.Name.PortScanner:

Source/NETworkManager/Views/Settings/SettingsGeneralImportExportView.xaml.cs

@@ -20,5 +20,10 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
             if (viewModel.CloseAction == null)
                 viewModel.CloseAction = new System.Action(Window.GetWindow(this).Close);
         }
+
+        public void SaveAndCheckSettings()
+        {
+            viewModel.SaveAndCheckSettings();
+        }
     }
 }

Source/NETworkManager/Views/Settings/SettingsGeneralSettingsView.xaml.cs

@@ -20,5 +20,10 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
             if (viewModel.CloseAction == null)
                 viewModel.CloseAction = new System.Action(Window.GetWindow(this).Close);
         }
+
+        public void SaveAndCheckSettings()
+        {
+            viewModel.SaveAndCheckSettings();
+        }
     }
 }