fix: fixed the rotation choice on the main thread. Add a try catch to…

… make sure it works.
ArchiDog1998 · Mar 18, 2023 · db291d8 · db291d8
1 parent f365bae
commit db291d8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction/BaseAction_Cooldown.cs b/RotationSolver.Basic/Actions/BaseAction/BaseAction_Cooldown.cs
@@ -1,8 +1,6 @@
 using FFXIVClientStructs.FFXIV.Client.Game;
 using RotationSolver.Basic;
 using RotationSolver.Basic.Helpers;
-using System;
-
 
 namespace RotationSolver.Actions.BaseAction;
 

diff --git a/RotationSolver/RotationHelper.cs b/RotationSolver/RotationHelper.cs
@@ -20,6 +20,11 @@ public static bool IsDefault(this ICustomRotation rotation)
 
     public static bool IsAllowed(this ICustomRotation rotation, out string name)
     {
+        if (rotation == null)
+        {
+            name = "Unknown";
+            return false;
+        }
         name = rotation.GetType().Assembly.GetName().Name;
         return _allowedAssembly.Contains(name);
     }

diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
@@ -1,25 +1,16 @@
-using Dalamud.Interface.Windowing;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Windowing;
+using FFXIVClientStructs.FFXIV.Client.Game;
 using ImGuiNET;
+using ImGuiScene;
 using RotationSolver.Basic;
-using RotationSolver.Updaters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using RotationSolver.Basic.Data;
 using RotationSolver.Basic.Actions;
-using RotationSolver.Commands;
+using RotationSolver.Basic.Data;
 using RotationSolver.Basic.Helpers;
-using FFXIVClientStructs.FFXIV.Client.Game;
-using Dalamud.Interface.Colors;
+using RotationSolver.Commands;
 using RotationSolver.Localization;
-using Lumina.Excel.GeneratedSheets;
-using ImGuiScene;
-using static System.Net.Mime.MediaTypeNames;
-using static FFXIVClientStructs.FFXIV.Client.Game.QuestManager.QuestListArray;
+using RotationSolver.Updaters;
+using System.Numerics;
 
 namespace RotationSolver.UI;
 

diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -42,13 +42,20 @@ private static void FrameworkUpdate(Framework framework)
         //        }
         //#endif
 
-        SocialUpdater.UpdateSocial();
-        PreviewUpdater.UpdatePreview();
-        ActionUpdater.UpdateWeaponTime();
+        try
+        {
+            SocialUpdater.UpdateSocial();
+            PreviewUpdater.UpdatePreview();
+            ActionUpdater.UpdateWeaponTime();
 
-        ActionUpdater.DoAction();
+            ActionUpdater.DoAction();
 
-        MacroUpdater.UpdateMacro();
+            MacroUpdater.UpdateMacro();
+        }
+        catch (Exception ex)
+        {
+            PluginLog.Error(ex, "Main Thread Exception");
+        }
 
         if (Service.Config.UseWorkTask)
         {