Merge pull request #225 from quisquous/find_correct_plugin

ngld · Nov 26, 2021 · 85c3146 · 85c3146
2 parents d6d8b6f + 33703b8
commit 85c3146
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/OverlayPlugin.Core/Integration/FFXIVRepository.cs b/OverlayPlugin.Core/Integration/FFXIVRepository.cs
@@ -65,13 +65,21 @@ public FFXIVRepository(TinyIoCContainer container)
             logger = container.Resolve<ILogger>();
         }
 
+        private ActPluginData GetPluginData() {
+            return ActGlobals.oFormActMain.ActPlugins.FirstOrDefault(plugin => {
+                if (!plugin.cbEnabled.Checked || plugin.pluginObj == null)
+                  return false;
+                return plugin.lblPluginTitle.Text.StartsWith("FFXIV_ACT_Plugin");
+            });
+        }
+
         private IDataRepository GetRepository()
         {
             if (repository != null)
                 return repository;
 
-            var FFXIV = ActGlobals.oFormActMain.ActPlugins.FirstOrDefault(x => x.lblPluginTitle.Text.StartsWith("FFXIV_ACT_Plugin"));
-            if (FFXIV != null && FFXIV.pluginObj != null)
+            var FFXIV = GetPluginData();
+            if (FFXIV != null)
             {
                 try
                 {
@@ -91,8 +99,8 @@ private IDataSubscription GetSubscription()
             if (subscription != null)
                 return subscription;
 
-            var FFXIV = ActGlobals.oFormActMain.ActPlugins.FirstOrDefault(x => x.lblPluginTitle.Text.StartsWith("FFXIV_ACT_Plugin"));
-            if (FFXIV != null && FFXIV.pluginObj != null)
+            var FFXIV = GetPluginData();
+            if (FFXIV != null)
             {
                 try
                 {

diff --git a/OverlayPlugin.Core/Integration/TriggIntegration.cs b/OverlayPlugin.Core/Integration/TriggIntegration.cs
@@ -13,14 +13,22 @@ class TriggIntegration
         private PluginMain _plugin;
         public delegate void CustomCallbackDelegate(object o, string param);
 
+        private ActPluginData GetPluginData() {
+            return ActGlobals.oFormActMain.ActPlugins.FirstOrDefault(plugin => {
+                if (!plugin.cbEnabled.Checked || plugin.pluginObj == null)
+                  return false;
+                return plugin.lblPluginTitle.Text == "Triggernometry.dll";
+            });
+        }
+
         public TriggIntegration(TinyIoCContainer container)
         {
             var logger = container.Resolve<ILogger>();
             _plugin = container.Resolve<PluginMain>();
 
             try
             {
-                var trigg = ActGlobals.oFormActMain.ActPlugins.FirstOrDefault(x => x.lblPluginTitle.Text == "Triggernometry.dll");
+                var trigg = GetPluginData();
                 if (trigg == null || trigg.pluginObj == null)
                     return;