diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 2ddcedf322..f61d2cdb16 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -636,7 +636,7 @@ class EditMetadataAction(InterfaceActionWithLibraryDrop): 'and any duplicate formats in the second and subsequently selected books ' 'will be permanently deleted from your calibre library.

' 'Are you sure you want to proceed?')%title + '

', - 'merge_only_formats', self.gui, mi): + 'merge_only_formats', self.gui, mi)[0]: return self.add_formats(dest_id, self.formats_for_books(rows)) self.delete_books_after_merge(src_ids) diff --git a/src/calibre/gui2/dialogs/confirm_merge.py b/src/calibre/gui2/dialogs/confirm_merge.py index f76601a28e..dafda0185f 100644 --- a/src/calibre/gui2/dialogs/confirm_merge.py +++ b/src/calibre/gui2/dialogs/confirm_merge.py @@ -102,7 +102,7 @@ class ConfirmMerge(Dialog): def confirm_merge(msg, name, parent, mi, ask_about_save_alternate_cover=False): config_set = dynamic if not config_set.get(confirm_config_name(name), True): - return True + True, bool(gprefs.get('choose-merge-cb-save_alternate_cover', False)) d = ConfirmMerge(msg, name, parent, mi, ask_about_save_alternate_cover) return d.exec() == QDialog.DialogCode.Accepted, d.save_alternate_cover_cb.isChecked()