From 92a692af2d001cf3fac6c0c728fc33070d590861 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 6 Nov 2020 23:16:12 +0530 Subject: [PATCH] Fix opening the MTP config dialog without a device connected broken in calibre 5 --- src/calibre/gui2/device_drivers/mtp_config.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/device_drivers/mtp_config.py b/src/calibre/gui2/device_drivers/mtp_config.py index 3c6fde9d38..578614164c 100644 --- a/src/calibre/gui2/device_drivers/mtp_config.py +++ b/src/calibre/gui2/device_drivers/mtp_config.py @@ -446,7 +446,7 @@ class MTPConfig(QTabWidget): def get_pref(self, key): p = self.device.prefs.get(self.current_device_key, {}) - if not p: + if not p and self.current_device_key is not None: self.device.prefs[self.current_device_key] = p return self.device.get_pref(key) @@ -490,7 +490,8 @@ class MTPConfig(QTabWidget): if self.current_ignored_folders != self.initial_ignored_folders: p['ignored_folders'] = self.current_ignored_folders - self.device.prefs[self.current_device_key] = p + if self.current_device_key is not None: + self.device.prefs[self.current_device_key] = p class SendError(QDialog):