🐛 Fix V1 server crash when toggling filter on and off repeatedly

Author: fredemmott

OTDIPC/OTDIPC.cs

@@ -12,7 +12,7 @@
 namespace OTDIPC
 {
     [PluginName("OpenKneeboard (OTD-IPC)")]
-    public class OTDIPC : IPositionedPipelineElement<IDeviceReport>, IDriver
+    public sealed class OTDIPC : IPositionedPipelineElement<IDeviceReport>, IDriver, IDisposable
     {
         State _state = new();
         private DeviceInfo? _deviceInfo;
@@ -46,6 +46,14 @@ public OTDIPC()
             }
         }
 
+        public void Dispose()
+        {
+            foreach (var server in _servers)
+            {
+                server.Dispose();
+            }
+        }
+
         public void Consume(IDeviceReport deviceReport)
         {
             if (!_servers.Any(s => s.HaveClient))

OTDIPC/ServerBase.cs

@@ -11,7 +11,7 @@
 
 namespace OTDIPC;
 
-public abstract class ServerBase : IDisposable, IServer
+public abstract class ServerBase : IServer
 {
     protected readonly IDriver _driver;
     protected Timer? _timer;
@@ -31,6 +31,7 @@ protected ServerBase(IDriver driver)
 
     public virtual void Dispose()
     {
+        GC.SuppressFinalize(this);
         _timer?.Dispose();
         _driver.TabletChanged -= Driver_TabletChanged;
         _driver.StateChanged -= Driver_StateChanged;

OTDIPC/V1/Server.cs

@@ -115,7 +115,17 @@ protected override async void RunServerAsync()
         _connection = pipe;
 
         Log.Write("otd-ipc", "Waiting for connection");
-        await pipe.WaitForConnectionAsync();
+        try
+        {
+            await pipe.WaitForConnectionAsync();
+        }
+        catch (IOException e)
+        {
+            _waitingForConnection = false;
+            Log.Write("otd-ipc", "Waiting for connection failed: " + e.Message);
+            return;
+        }
+
         Log.Write("otd-ipc", "Client connected");
         _waitingForConnection = false;
         _connected = true;
@@ -129,6 +139,15 @@ void OnClientConnected()
         this.SendMessage(_deviceInfo);
     }
 
+    public override void Dispose()
+    {
+        var conn = Interlocked.Exchange(ref _connection, null);
+        conn?.Dispose();
+
+        base.Dispose();
+        Log.Write("otd-ipc", "V1 server disposed");
+    }
+
     protected override void Ping()
     {
         if (_waitingForConnection)