From f8cfbbe3838d5fc07ed97d2ac3e1f7d30d9abfe2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 6 Jun 2020 08:50:42 +0530 Subject: [PATCH] Guard against invalid skip_dialog_name --- src/calibre/gui2/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 97320c3489..84a6470084 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -407,7 +407,12 @@ def question_dialog(parent, title, msg, det_msg='', show_copy_button=False, ): from calibre.gui2.dialogs.message_box import MessageBox - auto_skip = set(gprefs.get('questions_to_auto_skip', [])) + if not isinstance(skip_dialog_name, unicode_type): + skip_dialog_name = None + try: + auto_skip = set(gprefs.get('questions_to_auto_skip', ())) + except Exception: + auto_skip = set() if (skip_dialog_name is not None and skip_dialog_name in auto_skip): return bool(skip_dialog_skipped_value)