Handle scenarios where multiple devices report the same serial number

nwoolls · Dec 4, 2013 · d82d563 · d82d563
1 parent 696de56
commit d82d563
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MultiMiner.Win/MainForm.cs b/MultiMiner.Win/MainForm.cs
@@ -1754,8 +1754,9 @@ private int GetItemIndexForDeviceDetails(DeviceDetailsResponse deviceDetails)
                 if (device.Driver.Equals(deviceDetails.Driver, StringComparison.OrdinalIgnoreCase)
                     &&
                     (
-                    //serial == serial
-                    (!String.IsNullOrEmpty(device.Serial) && device.Serial.Equals(deviceDetails.Serial, StringComparison.OrdinalIgnoreCase))
+                    //serial == serial && path == path (serial may not be unique)
+                    (!String.IsNullOrEmpty(device.Serial) && device.Serial.Equals(deviceDetails.Serial, StringComparison.OrdinalIgnoreCase)
+                      && !String.IsNullOrEmpty(device.Path) && device.Path.Equals(deviceDetails.DevicePath, StringComparison.OrdinalIgnoreCase))
 
                     //path == path
                     || (!String.IsNullOrEmpty(device.Path) && device.Path.Equals(deviceDetails.DevicePath, StringComparison.OrdinalIgnoreCase))

diff --git a/MultiMiner.Xgminer/Device/DeviceDescriptor.cs b/MultiMiner.Xgminer/Device/DeviceDescriptor.cs
@@ -55,7 +55,10 @@ public bool Equals(Object obj)
                 //check for Serial on both sides as the Equals() needs to be bi-directional
                 return target.Driver.Equals(this.Driver, StringComparison.OrdinalIgnoreCase) && target.Path.Equals(this.Path, StringComparison.OrdinalIgnoreCase);
             else
-                return target.Driver.Equals(this.Driver, StringComparison.OrdinalIgnoreCase) && target.Serial.Equals(this.Serial, StringComparison.OrdinalIgnoreCase);
+                //match on Driver, Serial AND Path
+                //cannot just do Serial because, while it should be unique, in practice it is not
+                return target.Driver.Equals(this.Driver, StringComparison.OrdinalIgnoreCase) && target.Serial.Equals(this.Serial, StringComparison.OrdinalIgnoreCase)
+                    && target.Path.Equals(this.Path, StringComparison.OrdinalIgnoreCase);
         }
     }
 }