From 11427001a3cca9aacbc0fb5950a707d9667ab290 Mon Sep 17 00:00:00 2001 From: John Schember Date: Fri, 18 Dec 2009 19:05:59 -0500 Subject: [PATCH] USBMS: Move windows sort drives before checks for main. Should fix a bug detecting iriver story. --- src/calibre/devices/iriver/driver.py | 2 +- src/calibre/devices/usbms/device.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/iriver/driver.py b/src/calibre/devices/iriver/driver.py index 030fe8f6bb..f8e7d41600 100644 --- a/src/calibre/devices/iriver/driver.py +++ b/src/calibre/devices/iriver/driver.py @@ -13,7 +13,7 @@ class IRIVER_STORY(USBMS): name = 'Iriver Story Device Interface' gui_name = 'Iriver Story' description = _('Communicate with the Iriver Story reader.') - author = _('Kovid Goyal') + author = 'Kovid Goyal' supported_platforms = ['windows', 'osx', 'linux'] # Ordered list of supported formats diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 7cd702dd96..5effa0a8c6 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -302,13 +302,13 @@ class Device(DeviceConfig, DevicePlugin): drives['main'] = drives.pop('carda') drives = self.windows_open_callback(drives) + drives = self.windows_sort_drives(drives) if drives.get('main', None) is None: raise DeviceError( _('Unable to detect the %s disk drive. Try rebooting.') % self.__class__.__name__) - drives = self.windows_sort_drives(drives) self._main_prefix = drives.get('main') self._card_a_prefix = drives.get('carda', None) self._card_b_prefix = drives.get('cardb', None)