Check for device removal status before adding device to main view list

Fixes initial Switch Pro disconnect on hotplug
tailin · Aug 15, 2021 · a72d9cb · a72d9cb
1 parent 5f0920c
commit a72d9cb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs b/DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs
@@ -90,7 +90,8 @@ private void Service_HotplugController(ControlService sender,
             // Engage write lock pre-maturely
             using (WriteLocker readLock = new WriteLocker(_colListLocker))
             {
-                if (!controllerDict.ContainsKey(index))
+                // Look if device exists. Also, check if disconnect might be occurring
+                if (!controllerDict.ContainsKey(index) && !device.IsRemoving)
                 {
                     CompositeDeviceModel temp = new CompositeDeviceModel(device,
                         index, Global.ProfilePath[index], profileListHolder);
@@ -136,8 +137,8 @@ private void ControllersChanged(object sender, EventArgs e)
                     }
                     _colListLocker.ExitReadLock();
 
-
-                    if (!found)
+                    // Check for new device. Also, check if disconnect might be occurring
+                    if (!found && !currentDev.IsRemoving)
                     {
                         //int idx = controllerCol.Count;
                         _colListLocker.EnterWriteLock();