Merge pull request #608 from FFXIV-CombatReborn/hotfix69

Refactor RotationConfigWindow and update submodule
FFXIV-CombatReborn · Jan 31, 2025 · 5047caa · 5047caa
2 parents bf31547 + 4d3d21f
commit 5047caa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/ECommons b/ECommons
diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -145,22 +145,17 @@ private static void DrawDutyRotation()
     private void DrawErrorZone()
     {
         var incompatiblePlugins = DownloadHelper.IncompatiblePlugins ?? Array.Empty<IncompatiblePlugin>();
+        var installedIncompatiblePlugin = incompatiblePlugins.FirstOrDefault(p => p.IsInstalled && (int)p.Type == 5);
 
-        bool hasIncompatiblePlugin = incompatiblePlugins.Any(p => p.IsInstalled);
-
-        if (hasIncompatiblePlugin)
+        if (installedIncompatiblePlugin.Name != null)
         {
-            string message = "Disable incompatible plugin";
-            var installedPlugin = incompatiblePlugins.FirstOrDefault(p => p.IsInstalled);
-            message = $"Disable {installedPlugin.Name}, causes targetting issues.";
+            string message = $"Disable {installedIncompatiblePlugin.Name}, causes targetting issues.";
 
             float availableWidth = ImGui.GetContentRegionAvail().X; // Get the available width dynamically
-            using (var color = ImRaii.PushColor(ImGuiCol.Text, ImGui.ColorConvertFloat4ToU32(ImGuiColors.DalamudOrange)))
-            {
-                ImGui.PushTextWrapPos(ImGui.GetCursorPos().X + availableWidth); // Set text wrapping position dynamically
-                ImGui.Text(message);
-                ImGui.PopTextWrapPos(); // Reset text wrapping position
-            }
+            using var color = ImRaii.PushColor(ImGuiCol.Text, ImGui.ColorConvertFloat4ToU32(ImGuiColors.DalamudOrange));
+            ImGui.PushTextWrapPos(ImGui.GetCursorPos().X + availableWidth); // Set text wrapping position dynamically
+            ImGui.Text(message);
+            ImGui.PopTextWrapPos(); // Reset text wrapping position
         }
 
         if (DataCenter.SystemWarnings != null && DataCenter.SystemWarnings.Any())