From e480e64477a3692f8b1cd8015a8e73637ea37b4a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 8 May 2013 09:05:08 +0530 Subject: [PATCH] ... --- src/calibre/gui2/device_drivers/configwidget.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index 310b1537a3..17c97b7ba0 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -28,7 +28,10 @@ class ConfigWidget(QWidget, Ui_ConfigWidget): all_formats = set(all_formats) self.calibre_known_formats = device.FORMATS - self.device_name = device.get_gui_name() + try: + self.device_name = device.get_gui_name() + except TypeError: + self.device_name = getattr(device, 'gui_name', None) or _('Device') if device.USER_CAN_ADD_NEW_FORMATS: all_formats = set(all_formats) | set(BOOK_EXTENSIONS)