Merge pull request #418 from Aragas/dev

v5.8.3
Aragas · Jul 15, 2023 · 54cfbe7 · 54cfbe7
2 parents e42ab29 + 8d8ee0d
commit 54cfbe7
Show file tree

Hide file tree

Showing 4 changed files with 369 additions and 369 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,9 +3,9 @@
 
   <PropertyGroup>
     <GameVersion>1.0.0</GameVersion>
-    <Version>5.8.2</Version>
+    <Version>5.8.3</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
-    <ButterLibVersion>2.8.8</ButterLibVersion>
+    <ButterLibVersion>2.8.9</ButterLibVersion>
     <UIExtenderExVersion>2.8.0</UIExtenderExVersion>
     <BuildResourcesVersion>1.1.0.102</BuildResourcesVersion>
     <BUTRSharedVersion>3.0.0.137</BUTRSharedVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 5.8.3
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1
+* Fixed Close/Done buttons not working in the Options screen
+---------------------------------------------------------------------------------------------------
 Version: 5.8.2
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1
 * Added Preset Import/Export/Deleting

diff --git a/src/MCM.UI/GUI/ViewModels/ModOptionsVM.cs b/src/MCM.UI/GUI/ViewModels/ModOptionsVM.cs
@@ -293,8 +293,6 @@ public void ExecuteClose()
 
         public bool ExecuteCancelInternal(bool popScreen, Action? onClose = null)
         {
-            if (IsDisabled) return false;
-
             OnFinalize();
             if (popScreen) ScreenManager.PopScreen();
             else onClose?.Invoke();
@@ -309,8 +307,6 @@ public bool ExecuteCancelInternal(bool popScreen, Action? onClose = null)
         public void ExecuteDone() => ExecuteDoneInternal(true);
         public void ExecuteDoneInternal(bool popScreen, Action? onClose = null)
         {
-            if (IsDisabled) return;
-
             if (!ModSettingsList.Any(x => x.URS.ChangesMade))
             {
                 OnFinalize();