forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 01:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 307a5e610c into f4c49bc0f0

Browse source
This commit is contained in:
Benoit Verkindt 2017-10-02 13:27:14 +00:00 committed by GitHub
commit 1fb772a6a1
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
accounts/usbwallet/hub.go
View file

@ -133,11 +133,20 @@ func (hub *Hub) refreshWallets() {
} }
for _, info := range hid.Enumerate(hub.vendorID, 0) { for _, info := range hid.Enumerate(hub.vendorID, 0) {
for _, id := range hub.productIDs { for _, id := range hub.productIDs {
// The HID interface number is not available on windows and OSX
if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
if info.ProductID == id && info.Interface == -1 {
devices = append(devices, info)
break
}
} else {
if info.ProductID == id && info.Interface == 0 { if info.ProductID == id && info.Interface == 0 {
devices = append(devices, info) devices = append(devices, info)
break break
} }
} }
}
} }
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
// See rationale before the enumeration why this is needed and only on Linux. // See rationale before the enumeration why this is needed and only on Linux.