Fixed swapping buttons swapping the wrong controllers

Author: ericlbarrett

XOutput.v12.suo

@@ -154,9 +154,10 @@ public ControllerDevice[] detectControllers()
                 if (devices[i] != null && !directInput.IsDeviceAttached(devices[i].joystick.Information.InstanceGuid))
                 {
                     Console.WriteLine(devices[i].joystick.Properties.InstanceName + " Removed");
+                    devices[i] = null;
+                    workers[i].Abort();
                     workers[i] = null;
                     Unplug(i + 1);
-                    devices[i] = null;
                 }
             }
 
@@ -204,6 +205,16 @@ public ControllerDevice[] detectControllers()
                 joystick.Acquire();
 
                 devices[spot] = new ControllerDevice(joystick, spot + 1);
+                if (IsActive)
+                {
+                    processingData[spot] = new ContData();
+                    Console.WriteLine("Plug " + spot);
+                    Plugin(spot + 1);
+                    int t = spot;
+                    workers[spot] = new Thread(() =>
+                    { ProcessData(t); });
+                    workers[spot].Start();
+                }
             }
             return devices;
         }
@@ -217,6 +228,7 @@ public override bool Stop()
                 {
                     if (devices[i] != null && devices[i].enabled)
                     {
+                        Console.WriteLine(i);
                         workers[i].Abort();
                         workers[i] = null;
                         Unplug(i + 1);
@@ -279,6 +291,11 @@ private void ProcessData(int n)
             {
                 lock (ds4locks[n])
                 {
+                    if (devices[n] == null)
+                    {
+                        //Console.WriteLine("die" + n.ToString());
+                        //continue;
+                    }
                     byte[] data = devices[n].getoutput();
                     if (data != null && devices[n].enabled)
                     {

XOutput/ControllerManager.cs

@@ -110,9 +110,9 @@ private void UpdateInfo(ControllerDevice[] dev)
 
         private void Swap(int i, int p)
         {
-            bool s = checks[i].Checked;
-            checks[i].Checked = checks[p].Checked;
-            checks[p].Checked = s;
+            bool s = checks[i - 1].Checked;
+            checks[i- 1].Checked = checks[p - 1].Checked;
+            checks[p - 1].Checked = s;
             controllerManager.Swap(i, p);
 
             UpdateInfo(controllerManager.detectControllers());