From db7474d6f64d47fa712ca825fb2050a220e4cae1 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Tue, 8 Jun 2010 09:12:50 +0100 Subject: [PATCH] Fix bug #5754 - extra customization problems --- src/calibre/devices/prs505/driver.py | 3 ++- src/calibre/gui2/device_drivers/configwidget.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py index 071d651186..38fac8b266 100644 --- a/src/calibre/devices/prs505/driver.py +++ b/src/calibre/devices/prs505/driver.py @@ -143,10 +143,11 @@ class PRS505(USBMS): if booklists[i] is not None: blists[i] = booklists[i] opts = self.settings() - collections = ['series', 'tags'] if opts.extra_customization: collections = [x.strip() for x in opts.extra_customization.split(',')] + else: + collections = [] debug_print('PRS505: collection fields:', collections) c.update(blists, collections) c.write() diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index d1cebcb81d..585eed30df 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -38,9 +38,10 @@ class ConfigWidget(QWidget, Ui_ConfigWidget): self.opt_read_metadata.setChecked(self.settings.read_metadata) else: self.opt_read_metadata.hide() - if extra_customization_message and settings.extra_customization: + if extra_customization_message: self.extra_customization_label.setText(extra_customization_message) - self.opt_extra_customization.setText(settings.extra_customization) + if settings.extra_customization: + self.opt_extra_customization.setText(settings.extra_customization) else: self.extra_customization_label.setVisible(False) self.opt_extra_customization.setVisible(False)