From aa41224d573b774a692fb89a4ba5da6f503b7c35 Mon Sep 17 00:00:00 2001 From: Asval Date: Fri, 30 Aug 2024 17:51:38 +0200 Subject: [PATCH] slipping this in --- FModel/App.xaml.cs | 2 +- FModel/Settings/UserSettings.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs index 7b10d7c2..0efe2b16 100644 --- a/FModel/App.xaml.cs +++ b/FModel/App.xaml.cs @@ -142,7 +142,7 @@ public partial class App if (messageBox.Result == MessageBoxResult.Custom && (EErrorKind) messageBox.ButtonPressed.Id != EErrorKind.Ignore) { if ((EErrorKind) messageBox.ButtonPressed.Id == EErrorKind.ResetSettings) - UserSettings.Default = new UserSettings(); + UserSettings.Delete(); ApplicationService.ApplicationView.Restart(); } diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs index b5eb8e3e..f5f703a1 100644 --- a/FModel/Settings/UserSettings.cs +++ b/FModel/Settings/UserSettings.cs @@ -32,16 +32,21 @@ namespace FModel.Settings Default = new UserSettings(); } + private static bool _bSave = true; public static void Save() { - if (Default == null) return; + if (!_bSave || Default == null) return; Default.PerDirectory[Default.CurrentDir.GameDirectory] = Default.CurrentDir; File.WriteAllText(FilePath, JsonConvert.SerializeObject(Default, Formatting.Indented)); } public static void Delete() { - if (File.Exists(FilePath)) File.Delete(FilePath); + if (File.Exists(FilePath)) + { + _bSave = false; + File.Delete(FilePath); + } } public static bool IsEndpointValid(EEndpointType type, out EndpointSettings endpoint)