Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2071458 [calibre 7.13 merge+delete does not work](https://bugs.launchpad.net/calibre/+bug/2071458)

Browse Source
This commit is contained in:
Kovid Goyal 2024-06-28 19:11:42 +05:30
parent c6f23c35dc
commit d52da5b931
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/actions/edit_metadata.py
View File

@ -636,7 +636,7 @@ class EditMetadataAction(InterfaceActionWithLibraryDrop):
'and any duplicate formats in the second and subsequently selected books '
'will be permanently <b>deleted</b> from your calibre library.<br><br> '
'Are you <b>sure</b> you want to proceed?')%title + '</p>',
'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)

2
src/calibre/gui2/dialogs/confirm_merge.py
View File

@ -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()