From 105cb39e689a32bd80f18515893b7dda88edb4c7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 19 Jan 2016 16:52:21 +0530 Subject: [PATCH] Fix detected_device not being set --- src/calibre/devices/usbms/device.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 1708956546..6d86a3dc71 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -39,9 +39,14 @@ class USBDevice: self.idVendor = dev[0] self.idProduct = dev[1] self.bcdDevice = dev[2] - self.manufacturer = dev[3] - self.product = dev[4] - self.serial = dev[5] + if iswindows: + # Getting this information requires communicating with the device + # we only do that in the can_handle_windows() method, if needed. + self.manufacturer = self.serial = self.product = '' + else: + self.manufacturer = dev[3] + self.product = dev[4] + self.serial = dev[5] def match_serial(self, serial): return self.serial and self.serial == serial