Group cues

.gitignore

@@ -9,3 +9,7 @@ SigningCertificate_Encoded.txt
 *.zip
 /QPlayerOld
 /api
+/TestProj
+/TestResults
+/QPlayer.Tests/CueListTests2.cs
+/QPlayer.Tests/CueListTests3.cs

QPlayer.MagicQCTRLPlugin/MagicQCTRLPlugin.cs

@@ -61,7 +61,10 @@ private void MagicQCTRLTask()
                 driver?.OnMessageReceived -= Driver_OnMessageReceived;
                 MainViewModel.Log($"MagicQCTRL disconnected due to an error: {ex.Message}", MainViewModel.LogLevel.Warning);
             }
-            driver?.Dispose();
+            finally
+            {
+                driver?.Dispose();
+            }
         }
     }
 

QPlayer.MagicQCTRLPlugin/QPlayer.MagicQCTRLPlugin.csproj

@@ -7,7 +7,7 @@
 		<EnableDynamicLoading>true</EnableDynamicLoading>
 		<UseWPF>true</UseWPF>
 
-		<Version>0.1.1</Version>
+		<Version>0.1.2</Version>
 		<Authors>Thomas Mathieson</Authors>
 		<Company>Thomas Mathieson</Company>
 		<Copyright>©️ Thomas Mathieson 2026</Copyright>

QPlayer.MagicQCTRLPlugin/USBDriver.cs

@@ -38,10 +38,12 @@ internal class USBDriver : IDisposable
 
     public void USBConnectAsync()
     {
-        DeviceList.Local.Changed += (o, e) =>
-        {
-            USBConnect();
-        };
+        DeviceList.Local.Changed += OnDeviceListChangedHandler;
+    }
+
+    private void OnDeviceListChangedHandler(object? sender, EventArgs e)
+    {
+        USBConnect();
     }
 
     /// <summary>
@@ -203,6 +205,11 @@ public void Dispose()
             usbRXTask?.Dispose();
         }
         catch { }
+        try
+        {
+            DeviceList.Local.Changed -= OnDeviceListChangedHandler;
+        }
+        catch { }
         usbDevice = null;
         OnConnectionStatusChanged?.Invoke(false);
         isDisposing = false;