Fixed issue with xinput unplug routine on device removal

Ryochan7 · Ryochan7 · commit 3dd88e481c67 · 2019-02-07T16:40:24.000-06:00
Related to issue Jays2Kings#554
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
@@ -2602,7 +2602,6 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,
                 catch { dinputOnly[device] = false; missingSetting = true; }
 
                 bool oldUseDInputOnly = Global.useDInputOnly[device];
-                Global.useDInputOnly[device] = dinputOnly[device];
 
                 // Only change xinput devices under certain conditions. Avoid
                 // performing this upon program startup before loading devices.
@@ -2618,20 +2617,14 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,
                         {
                             if (dinputOnly[device] == true)
                             {
-                                Global.useDInputOnly[device] = true;
                                 xinputPlug = false;
                                 xinputStatus = true;
                             }
                             else if (synced && isAlive)
                             {
-                                Global.useDInputOnly[device] = false;
                                 xinputPlug = true;
                                 xinputStatus = true;
                             }
-                            else if (!synced)
-                            {
-                                Global.useDInputOnly[device] = true;
-                            }
                         }
                     }
                 }
@@ -2995,12 +2988,12 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,
                             int xinputIndex = control.x360Bus.FirstController + device;
                             if (xinputResult)
                             {
-                                dinputOnly[device] = false;
+                                Global.useDInputOnly[device] = false;
                                 AppLogger.LogToGui("X360 Controller # " + xinputIndex + " connected", false);
                             }
                             else
                             {
-                                dinputOnly[device] = true;
+                                Global.useDInputOnly[device] = true;
                                 AppLogger.LogToGui("X360 Controller # " + xinputIndex + " failed. Using DInput only mode", true);
                             }
                         }
@@ -3010,11 +3003,12 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,
                             int xinputIndex = control.x360Bus.FirstController + device;
                             if (xinputResult)
                             {
-                                dinputOnly[device] = true;
+                                Global.useDInputOnly[device] = true;
                                 AppLogger.LogToGui("X360 Controller # " + xinputIndex + " unplugged", false);
                             }
                             else
                             {
+                                Global.useDInputOnly[device] = false;
                                 AppLogger.LogToGui("X360 Controller # " + xinputIndex + " failed to unplug", true);
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -2602,7 +2602,6 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,`
`2602`	`2602`	`catch { dinputOnly[device] = false; missingSetting = true; }`
`2603`	`2603`
`2604`	`2604`	`bool oldUseDInputOnly = Global.useDInputOnly[device];`
`2605`		`- Global.useDInputOnly[device] = dinputOnly[device];`
`2606`	`2605`
`2607`	`2606`	`// Only change xinput devices under certain conditions. Avoid`
`2608`	`2607`	`// performing this upon program startup before loading devices.`
`@@ -2618,20 +2617,14 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,`
`2618`	`2617`	`{`
`2619`	`2618`	`if (dinputOnly[device] == true)`
`2620`	`2619`	`{`
`2621`		`- Global.useDInputOnly[device] = true;`
`2622`	`2620`	`xinputPlug = false;`
`2623`	`2621`	`xinputStatus = true;`
`2624`	`2622`	`}`
`2625`	`2623`	`else if (synced && isAlive)`
`2626`	`2624`	`{`
`2627`		`- Global.useDInputOnly[device] = false;`
`2628`	`2625`	`xinputPlug = true;`
`2629`	`2626`	`xinputStatus = true;`
`2630`	`2627`	`}`
`2631`		`- else if (!synced)`
`2632`		`- {`
`2633`		`- Global.useDInputOnly[device] = true;`
`2634`		`- }`
`2635`	`2628`	`}`
`2636`	`2629`	`}`
`2637`	`2630`	`}`
`@@ -2995,12 +2988,12 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,`
`2995`	`2988`	`int xinputIndex = control.x360Bus.FirstController + device;`
`2996`	`2989`	`if (xinputResult)`
`2997`	`2990`	`{`
`2998`		`- dinputOnly[device] = false;`
	`2991`	`+ Global.useDInputOnly[device] = false;`
`2999`	`2992`	`AppLogger.LogToGui("X360 Controller # " + xinputIndex + " connected", false);`
`3000`	`2993`	`}`
`3001`	`2994`	`else`
`3002`	`2995`	`{`
`3003`		`- dinputOnly[device] = true;`
	`2996`	`+ Global.useDInputOnly[device] = true;`
`3004`	`2997`	`AppLogger.LogToGui("X360 Controller # " + xinputIndex + " failed. Using DInput only mode", true);`
`3005`	`2998`	`}`
`3006`	`2999`	`}`
`@@ -3010,11 +3003,12 @@ public bool LoadProfile(int device, bool launchprogram, ControlService control,`
`3010`	`3003`	`int xinputIndex = control.x360Bus.FirstController + device;`
`3011`	`3004`	`if (xinputResult)`
`3012`	`3005`	`{`
`3013`		`- dinputOnly[device] = true;`
	`3006`	`+ Global.useDInputOnly[device] = true;`
`3014`	`3007`	`AppLogger.LogToGui("X360 Controller # " + xinputIndex + " unplugged", false);`
`3015`	`3008`	`}`
`3016`	`3009`	`else`
`3017`	`3010`	`{`
	`3011`	`+ Global.useDInputOnly[device] = false;`
`3018`	`3012`	`AppLogger.LogToGui("X360 Controller # " + xinputIndex + " failed to unplug", true);`
`3019`	`3013`	`}`
`3020`	`3014`	`}`