From 9d5dafaed632f298d13155baacb8a8e0cf10b5fe Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Tue, 23 Nov 2021 16:04:41 +1000 Subject: [PATCH] Fixed a crashing bug when the server manager closes and is unable to find the backup location to save the config settings. --- src/ARKServerManager/VersionFeed.xml | 5 ++++ src/ARKServerManager/VersionFeedBeta.xml | 5 ++++ .../Windows/MainWindow.xaml.cs | 2 +- src/ConanServerManager/VersionFeed.xml | 5 ++++ src/ConanServerManager/VersionFeedBeta.xml | 5 ++++ .../Windows/MainWindow.xaml.cs | 2 +- .../Utils/SettingsUtils.cs | 23 ++++++++++++------- 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 365c572a..c61e5869 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -16,6 +16,11 @@

+ BUGFIX +
+

    +
  • Fixed a crashing bug when ASM closes and is unable to find the backup location to save the config settings.
    • +
NEW
    diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 4bbc309f..6c0b333c 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -16,6 +16,11 @@

    + BUGFIX +
    +

      +
    • Fixed a crashing bug when ASM closes and is unable to find the backup location to save the config settings.
      • +
    NEW
      diff --git a/src/ARKServerManager/Windows/MainWindow.xaml.cs b/src/ARKServerManager/Windows/MainWindow.xaml.cs index e76dd231..d4ea4f77 100644 --- a/src/ARKServerManager/Windows/MainWindow.xaml.cs +++ b/src/ARKServerManager/Windows/MainWindow.xaml.cs @@ -218,7 +218,7 @@ namespace ServerManagerTool private void Window_SizeChanged(object sender, SizeChangedEventArgs e) { - if (this.WindowState != WindowState.Minimized) + if (this.WindowState == WindowState.Normal) { Config.Default.MainWindow_Height = e.NewSize.Height; Config.Default.MainWindow_Width = e.NewSize.Width; diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 6ce0416c..8372afd4 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -16,6 +16,11 @@

      + BUGFIX +
      +

        +
      • Fixed a crashing bug when CSM closes and is unable to find the backup location to save the config settings.
        • +
      NEW
        diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 5beccf81..1a01890c 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -16,6 +16,11 @@

        + BUGFIX +
        +

          +
        • Fixed a crashing bug when CSM closes and is unable to find the backup location to save the config settings.
          • +
        NEW
          diff --git a/src/ConanServerManager/Windows/MainWindow.xaml.cs b/src/ConanServerManager/Windows/MainWindow.xaml.cs index 04cc0fe4..be46d9b5 100644 --- a/src/ConanServerManager/Windows/MainWindow.xaml.cs +++ b/src/ConanServerManager/Windows/MainWindow.xaml.cs @@ -211,7 +211,7 @@ namespace ServerManagerTool private void Window_SizeChanged(object sender, SizeChangedEventArgs e) { - if (this.WindowState != WindowState.Minimized) + if (this.WindowState == WindowState.Normal) { Config.Default.MainWindow_Height = e.NewSize.Height; Config.Default.MainWindow_Width = e.NewSize.Width; diff --git a/src/ServerManager.Common/Utils/SettingsUtils.cs b/src/ServerManager.Common/Utils/SettingsUtils.cs index 4568e1df..e5f4f63d 100644 --- a/src/ServerManager.Common/Utils/SettingsUtils.cs +++ b/src/ServerManager.Common/Utils/SettingsUtils.cs @@ -47,18 +47,25 @@ namespace ServerManagerTool.Common.Utils // do nothing, just exit } - var filesToDelete = new DirectoryInfo(backupPath).GetFiles($"{settingsFileName}_*{settingsFileExt}").Where(f => f.LastWriteTimeUtc.AddDays(7) < DateTime.UtcNow).ToArray(); - foreach (var fileToDelete in filesToDelete) + try { - try + var filesToDelete = new DirectoryInfo(backupPath).GetFiles($"{settingsFileName}_*{settingsFileExt}").Where(f => f.LastWriteTimeUtc.AddDays(7) < DateTime.UtcNow).ToArray(); + foreach (var fileToDelete in filesToDelete) { - fileToDelete.Delete(); - } - catch (Exception) - { - // do nothing, just exit + try + { + fileToDelete.Delete(); + } + catch (Exception) + { + // do nothing, just exit + } } } + catch (Exception) + { + // do nothing, just exit + } } }