Fix version mismatch check

architdate · Jun 6, 2023 · 607ae09 · 607ae09
1 parent 093f0cc
commit 607ae09
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/AutoLegalityMod/GUI/ALMSettings.cs b/AutoLegalityMod/GUI/ALMSettings.cs
@@ -35,7 +35,7 @@ private void ALMSettings_FormClosing(object sender, FormClosingEventArgs e)
             pluginSettings.Save();
         }
 
-        private void EditSettingsProperties(object _settings)
+        private static void EditSettingsProperties(object _settings)
         {
             var lang = WinFormsTranslator.CurrentLanguage;
             var translation = WinFormsTranslator.GetContext(lang);

diff --git a/AutoLegalityMod/Plugins/AutoModPlugin.cs b/AutoLegalityMod/Plugins/AutoModPlugin.cs
@@ -104,13 +104,15 @@ private async Task TranslateInterface(CancellationToken token)
         private static (bool, ALMError?) CheckForMismatch()
         {
             bool mismatch = ALMVersion.GetIsMismatch();
-            if (mismatch)
-            {
-                _settings.EnableDevMode = false;
+            bool reset = ALMVersion.Versions.CoreVersionCurrent > new Version(_settings.LatestAllowedVersion);
+            if (reset)
                 _settings.LatestAllowedVersion = "0.0.0.0";
-                return (mismatch, WinFormsUtil.ALMErrorMismatch(ALMVersion.Versions));
-            }
-            return (false, null);
+
+            _settings.EnableDevMode = _settings.EnableDevMode && !mismatch;
+            if (mismatch || reset)
+                _settings.Save();
+
+            return (mismatch, mismatch ? WinFormsUtil.ALMErrorMismatch(ALMVersion.Versions) : null);
         }
 
         private void LoadMenuStrip(ToolStrip menuStrip)

diff --git a/PKHeX.Core.AutoMod/AutoMod/Util/Version.cs b/PKHeX.Core.AutoMod/AutoMod/Util/Version.cs
@@ -31,7 +31,7 @@ public static bool GetIsMismatch(Version? currentCore, Version? currentALM, Vers
                 return false;
 
             var latestAllowed = new Version(APILegality.LatestAllowedVersion);
-            if (APILegality.EnableDevMode && (latestCore > latestAllowed))
+            if (APILegality.EnableDevMode && (latestCore > latestAllowed) && (latestCore > currentCore))
                 return true;
             return !APILegality.EnableDevMode && (currentCore > currentALM);
         }

diff --git a/PKHeX.Core.Injection/Enums/LiveHeXVersion.cs b/PKHeX.Core.Injection/Enums/LiveHeXVersion.cs
@@ -1,6 +1,4 @@
-using System.Runtime.CompilerServices;
-
-namespace PKHeX.Core.Injection
+namespace PKHeX.Core.Injection
 {
     public enum LiveHeXVersion
     {