From d5ed4a38e4b760b369cc2cbe773a9d017ff464d6 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Fri, 12 Apr 2024 14:39:12 +0200
Subject: [PATCH] Fix2?

---
 Penumbra.Api                       |  2 +-
 Penumbra/Api/Api/PluginStateApi.cs | 43 ++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Penumbra.Api b/Penumbra.Api
index cd56068a..a8e2fe02 160000
--- a/Penumbra.Api
+++ b/Penumbra.Api
@@ -1 +1 @@
-Subproject commit cd56068aac3762c7b011d13a04637a3c3f09775f
+Subproject commit a8e2fe0219b8fd1f787171f11e33571317e531c1
diff --git a/Penumbra/Api/Api/PluginStateApi.cs b/Penumbra/Api/Api/PluginStateApi.cs
index e1eec1b2..e053e56f 100644
--- a/Penumbra/Api/Api/PluginStateApi.cs
+++ b/Penumbra/Api/Api/PluginStateApi.cs
@@ -5,26 +5,41 @@ using Penumbra.Services;
 
 namespace Penumbra.Api.Api;
 
-public class PluginStateApi(Configuration config, CommunicatorService communicator) : IPenumbraApiPluginState, IApiService
+public sealed class PluginStateApi : IPenumbraApiPluginState, IApiService, IDisposable
 {
+    private readonly Configuration       _config;
+    private readonly CommunicatorService _communicator;
+
+    public PluginStateApi(Configuration config, CommunicatorService communicator)
+    {
+        _config       = config;
+        _communicator = communicator;
+        _communicator.ModDirectoryChanged.Subscribe(OnModDirectoryChanged, Communication.ModDirectoryChanged.Priority.Api);
+        _communicator.EnabledChanged.Subscribe(OnEnabledChanged, EnabledChanged.Priority.Api);
+    }
+
+    public void Dispose()
+    {
+        _communicator.ModDirectoryChanged.Unsubscribe(OnModDirectoryChanged);
+        _communicator.EnabledChanged.Unsubscribe(OnEnabledChanged);
+    }
+
     public string GetModDirectory()
-        => config.ModDirectory;
+        => _config.ModDirectory;
 
     public string GetConfiguration()
-        => JsonConvert.SerializeObject(config, Formatting.Indented);
+        => JsonConvert.SerializeObject(_config, Formatting.Indented);
 
-    public event Action<string, bool> ModDirectoryChanged
-    {
-        add => communicator.ModDirectoryChanged.Subscribe(value, Communication.ModDirectoryChanged.Priority.Api);
-        remove => communicator.ModDirectoryChanged.Unsubscribe(value);
-    }
+    public event Action<string, bool>? ModDirectoryChanged;
 
     public bool GetEnabledState()
-        => config.EnableMods;
+        => _config.EnableMods;
 
-    public event Action<bool> EnabledChange
-    {
-        add => communicator.EnabledChanged.Subscribe(value!, EnabledChanged.Priority.Api);
-        remove => communicator.EnabledChanged.Unsubscribe(value!);
-    }
+    public event Action<bool>? EnabledChange;
+
+    private void OnModDirectoryChanged(string modDirectory, bool valid)
+        => ModDirectoryChanged?.Invoke(modDirectory, valid);
+
+    private void OnEnabledChanged(bool value)
+        => EnabledChange?.Invoke(value);
 }