From 8b22f780b30663d6e559c4c836679225f43deb9e Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 16 Jan 2009 07:31:30 -0500 Subject: [PATCH] Better device detection on Windows --- src/calibre/devices/scanner.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/devices/scanner.py b/src/calibre/devices/scanner.py index 26ea67ea44..f0cd9a66eb 100644 --- a/src/calibre/devices/scanner.py +++ b/src/calibre/devices/scanner.py @@ -60,8 +60,9 @@ class DeviceScanner(object): def is_device_connected(self, device): if iswindows: vid, pid = 'vid_%4.4x'%device.VENDOR_ID, 'pid_%4.4x'%device.PRODUCT_ID + vidd, pidd = 'vid_%i'%device.VENDOR_ID, 'pid_%i'%device.PRODUCT_ID for device_id in self.devices: - if vid in device_id and pid in device_id: + if (vid in device_id or vidd in device_id) and (pid in device_id or pidd in device_id): if self.test_bcd_windows(device_id, getattr(device, 'BCD', None)): if device.can_handle(device_id): return True