From c9dda91aef5265ea6111065d7dce6c4abd38e5bc Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Mon, 8 Aug 2022 22:59:07 +1000 Subject: [PATCH] Shutdown Server Day Changes - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant. --- src/ARKServerManager/Styles/Default.xaml | 1 - .../UserControls/ServerSettingsControl.xaml | 31 ++++++++++--------- src/ARKServerManager/VersionFeed.xml | 9 ++++-- src/ARKServerManager/VersionFeedBeta.xml | 23 ++++++++++++++ src/ConanServerManager/Styles/Default.xaml | 1 - .../UserControls/ServerSettingsControl.xaml | 31 ++++++++++--------- src/ConanServerManager/VersionFeed.xml | 9 ++++-- src/ConanServerManager/VersionFeedBeta.xml | 23 ++++++++++++++ .../Converters/FlagsEnumToBooleanConverter.cs | 10 +++--- 9 files changed, 99 insertions(+), 39 deletions(-) diff --git a/src/ARKServerManager/Styles/Default.xaml b/src/ARKServerManager/Styles/Default.xaml index 9e31c1a5..c5bebb68 100644 --- a/src/ARKServerManager/Styles/Default.xaml +++ b/src/ARKServerManager/Styles/Default.xaml @@ -12,7 +12,6 @@ - diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index 2bb0f988..b677c851 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -32,6 +32,9 @@ + + + @@ -1426,31 +1429,31 @@ @@ -1480,31 +1483,31 @@ diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 0260ff8d..7c875757 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,13 +9,18 @@ urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633 - 1.1.437 (1.1.437.4) - 1.1.437.4 + 1.1.437 (1.1.437.5) + 1.1.437.5 2022-08-08T00:00:00Z

+ BUGFIX +
+

    +
  • Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.
    • +
CHANGE
    diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index c6b40e5b..04ebbd1b 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-08-08T00:00:00Z + + urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633 + 1.1.437 (1.1.437.5) + 1.1.437.5 + + 2022-08-08T00:00:00Z + +
    +

    + BUGFIX +
    +

      +
    • Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633 1.1.437 (1.1.437.4) diff --git a/src/ConanServerManager/Styles/Default.xaml b/src/ConanServerManager/Styles/Default.xaml index a8211ea4..62d5c42a 100644 --- a/src/ConanServerManager/Styles/Default.xaml +++ b/src/ConanServerManager/Styles/Default.xaml @@ -12,7 +12,6 @@ - diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml index 014a2d48..e2a963fc 100644 --- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml @@ -21,6 +21,9 @@ + + + @@ -1007,31 +1010,31 @@ @@ -1061,31 +1064,31 @@ diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 61a090ec..4a3dd3ad 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,13 +9,18 @@ urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.5) - 1.1.80.5 + 1.1.80 (1.1.80.6) + 1.1.80.6 2022-08-08T00:00:00Z

    + BUGFIX +
    +

      +
    • Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.
      • +
    CHANGE
      diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 64f94d3e..d74220d2 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-08-08T00:00:00Z + + urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C + 1.1.80 (1.1.80.6) + 1.1.80.6 + + 2022-08-08T00:00:00Z + +
      +

      + BUGFIX +
      +

        +
      • Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.
        • +
      +

      +
      +       + + bletch + bletch1971@hotmail.com + +       + urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C 1.1.80 (1.1.80.5) diff --git a/src/ServerManager.Common/Converters/FlagsEnumToBooleanConverter.cs b/src/ServerManager.Common/Converters/FlagsEnumToBooleanConverter.cs index 01ecc57d..7bc8dde3 100644 --- a/src/ServerManager.Common/Converters/FlagsEnumToBooleanConverter.cs +++ b/src/ServerManager.Common/Converters/FlagsEnumToBooleanConverter.cs @@ -6,20 +6,20 @@ namespace ServerManagerTool.Common.Converters { public class FlagsEnumToBooleanConverter : IValueConverter { - private int targetValue; + private int _targetValue; public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { var mask = System.Convert.ToInt32(parameter); - this.targetValue = System.Convert.ToInt32(value); + _targetValue = System.Convert.ToInt32(value); - return ((mask & this.targetValue) != 0); + return (mask & _targetValue) != 0; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { - this.targetValue ^= System.Convert.ToInt32(parameter); - return Enum.Parse(targetType, this.targetValue.ToString()); + _targetValue ^= System.Convert.ToInt32(parameter); + return Enum.Parse(targetType, _targetValue.ToString()); } } }