From 09775678bb0b0bcda31fe077cb71a38c2f857ac9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 17 Oct 2013 12:28:00 +0530 Subject: [PATCH] Fix custom device driver swap main and card option not working --- src/calibre/devices/user_defined/driver.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/user_defined/driver.py b/src/calibre/devices/user_defined/driver.py index a88264c517..2449d5062c 100644 --- a/src/calibre/devices/user_defined/driver.py +++ b/src/calibre/devices/user_defined/driver.py @@ -120,7 +120,8 @@ class USER_DEFINED(USBMS): self.plugin_needs_delayed_initialization = False def windows_sort_drives(self, drives): - if len(drives) < 2: return drives + if len(drives) < 2: + return drives e = self.settings().extra_customization if not e[self.OPT_SWAP_MAIN_AND_CARD]: return drives @@ -132,7 +133,8 @@ class USER_DEFINED(USBMS): return drives def linux_swap_drives(self, drives): - if len(drives) < 2 or not drives[1] or not drives[2]: return drives + if len(drives) < 2 or not drives[0] or not drives[1]: + return drives e = self.settings().extra_customization if not e[self.OPT_SWAP_MAIN_AND_CARD]: return drives @@ -143,7 +145,8 @@ class USER_DEFINED(USBMS): return tuple(drives) def osx_sort_names(self, names): - if len(names) < 2: return names + if len(names) < 2: + return names e = self.settings().extra_customization if not e[self.OPT_SWAP_MAIN_AND_CARD]: return names