check for testing api level in HasTestingVersion() instead

goatcorp · Jul 3, 2024 · 8d08f46 · 8d08f46
1 parent a4a3318
commit 8d08f46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
@@ -2274,7 +2274,7 @@ private void DrawAvailablePlugin(RemotePluginManifest manifest, int index)
         if (useTesting || manifest.IsTestingExclusive)
             flags |= PluginHeaderFlags.IsTesting;
 
-        if (this.DrawPluginCollapsingHeader(label, null, manifest, flags, () => this.DrawAvailablePluginContextMenu(manifest, effectiveApiLevel), index))
+        if (this.DrawPluginCollapsingHeader(label, null, manifest, flags, () => this.DrawAvailablePluginContextMenu(manifest), index))
         {
             if (!wasSeen)
                 configuration.SeenPluginInternalName.Add(manifest.InternalName);
@@ -2352,14 +2352,13 @@ private void DrawAvailablePlugin(RemotePluginManifest manifest, int index)
         ImGui.PopID();
     }
 
-    private void DrawAvailablePluginContextMenu(RemotePluginManifest manifest, int effectiveApiLevel)
+    private void DrawAvailablePluginContextMenu(RemotePluginManifest manifest)
     {
         var configuration = Service<DalamudConfiguration>.Get();
         var pluginManager = Service<PluginManager>.Get();
 
         var hasTestingVersionAvailable = configuration.DoPluginTest &&
-                                         PluginManager.HasTestingVersion(manifest) &&
-                                         manifest.TestingDalamudApiLevel == effectiveApiLevel;
+                                         PluginManager.HasTestingVersion(manifest);
 
         if (ImGui.BeginPopupContextItem("ItemContextMenu"))
         {

diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs
@@ -281,7 +281,8 @@ public static bool HasTestingVersion(IPluginManifest manifest)
 
         if (hasTv)
         {
-            return tv > av;
+            return tv > av &&
+                   manifest.TestingDalamudApiLevel == DalamudApiLevel;
         }
 
         return false;