From da5f9b35c9c8284433d1f8467b2dee6aa992010f Mon Sep 17 00:00:00 2001 From: Matt McManis Date: Thu, 28 May 2020 20:29:51 -0700 Subject: [PATCH] Update MainWindow.xaml.cs Fixed Export Config from Program Files Directory --- source/Axiom/Axiom/MainWindow.xaml.cs | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/source/Axiom/Axiom/MainWindow.xaml.cs b/source/Axiom/Axiom/MainWindow.xaml.cs index dc0b11ea..ed90aab4 100644 --- a/source/Axiom/Axiom/MainWindow.xaml.cs +++ b/source/Axiom/Axiom/MainWindow.xaml.cs @@ -589,9 +589,9 @@ void Window_Closing(object sender, CancelEventArgs e) // ------------------------- // Ignore Program Files // ------------------------- - if (!appRootDir.Contains(programFilesDir) && - !appRootDir.Contains(programFilesX86Dir) && - !appRootDir.Contains(programFilesX64Dir) + if (!Configure.configDir.Contains(programFilesDir) && + !Configure.configDir.Contains(programFilesX86Dir) && + !Configure.configDir.Contains(programFilesX64Dir) ) { try @@ -656,7 +656,9 @@ void Window_Closing(object sender, CancelEventArgs e) File.Move(logAppDataRoamingPath, logAppDataLocalPath); } + // ------------------------- // Save Config + // ------------------------- ExportWriteConfig(Configure.configDir); } catch (IOException ex) @@ -691,9 +693,9 @@ void Window_Closing(object sender, CancelEventArgs e) // ------------------------- // Ignore Program Files // ------------------------- - if (!appRootDir.Contains(programFilesDir) && - !appRootDir.Contains(programFilesX86Dir) && - !appRootDir.Contains(programFilesX64Dir) + if (!Configure.configDir.Contains(programFilesDir) && + !Configure.configDir.Contains(programFilesX86Dir) && + !Configure.configDir.Contains(programFilesX64Dir) ) { try @@ -758,7 +760,9 @@ void Window_Closing(object sender, CancelEventArgs e) File.Move(logAppDataLocalPath, logAppDataRoamingPath); } + // ------------------------- // Save Config + // ------------------------- ExportWriteConfig(Configure.configDir); } catch (IOException ex) @@ -792,9 +796,9 @@ void Window_Closing(object sender, CancelEventArgs e) // ------------------------- // Ignore Program Files // ------------------------- - if (!appRootDir.Contains(programFilesDir) && - !appRootDir.Contains(programFilesX86Dir) && - !appRootDir.Contains(programFilesX64Dir) + if (!Configure.configDir.Contains(programFilesDir) && + !Configure.configDir.Contains(programFilesX86Dir) && + !Configure.configDir.Contains(programFilesX64Dir) ) { try @@ -859,7 +863,9 @@ void Window_Closing(object sender, CancelEventArgs e) File.Move(logAppDataRoamingPath, logAppRootPath); } + // ------------------------- // Save Config + // ------------------------- ExportWriteConfig(Configure.configDir); } catch (IOException ex) @@ -955,11 +961,14 @@ public void ExportWriteConfig(string path) VM.ConfigureView.CustomPresetsPath_Text != conf.Read("Settings", "CustomPresetsPath_Text") || VM.ConfigureView.LogPath_Text != conf.Read("Settings", "LogPath_Text") || VM.ConfigureView.LogCheckBox_IsChecked != settings_LogCheckBox_IsChecked || + VM.ConfigureView.Shell_SelectedItem != conf.Read("Settings", "Shell_SelectedItem") || VM.ConfigureView.ProcessPriority_SelectedItem != conf.Read("Settings", "ProcessPriority_SelectedItem") || VM.ConfigureView.Threads_SelectedItem != conf.Read("Settings", "Threads_SelectedItem") || VM.ConfigureView.OutputOverwrite_SelectedItem != conf.Read("Settings", "OutputOverwrite_SelectedItem") || + VM.ConfigureView.Theme_SelectedItem != conf.Read("Settings", "Theme_SelectedItem") || + VM.ConfigureView.UpdateAutoCheck_IsChecked != settings_UpdateAutoCheck_IsChecked ) {