From ff4e978ce51d5c95b0175cdad871838c335bfd51 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 11 May 2025 10:39:05 +0100 Subject: [PATCH] Revert "Change the plugin configuration do_user_config() to reopen the the dialog if the validator fails. This happens only if the plugin has a config widget and validators." This reverts commit 19a2115618a3a5d0624eaa8f5ca0b3aa821033a7. --- src/calibre/customize/__init__.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py index f6dbd64ce1..568267b6be 100644 --- a/src/calibre/customize/__init__.py +++ b/src/calibre/customize/__init__.py @@ -180,19 +180,14 @@ class Plugin: # {{{ v.addWidget(button_box) if not config_dialog.restore_geometry(gprefs, prefname): QApplication.instance().ensure_window_on_screen(config_dialog) - while True: - validation_error = False - config_dialog.exec() - if config_dialog.result() == QDialog.DialogCode.Accepted: - if hasattr(config_widget, 'validate'): - if config_widget.validate(): - self.save_settings(config_widget) - else: - validation_error = True - else: + config_dialog.exec() + + if config_dialog.result() == QDialog.DialogCode.Accepted: + if hasattr(config_widget, 'validate'): + if config_widget.validate(): self.save_settings(config_widget) - if not validation_error: - break + else: + self.save_settings(config_widget) else: from calibre.customize.ui import customize_plugin, plugin_customization help_text = self.customization_help(gui=True)