mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
oops
This commit is contained in:
parent
98ea598b96
commit
f1b3ee781b
@ -259,12 +259,6 @@ class AddAction(InterfaceAction):
|
|||||||
if hasattr(self.gui, 'db_images'):
|
if hasattr(self.gui, 'db_images'):
|
||||||
self.gui.db_images.reset()
|
self.gui.db_images.reset()
|
||||||
self.gui.tags_view.recount()
|
self.gui.tags_view.recount()
|
||||||
# The formats of the current book could have changed if
|
|
||||||
# automerge is enabled
|
|
||||||
current_idx = self.gui.library_view.currentIndex()
|
|
||||||
if current_idx.isValid():
|
|
||||||
self.gui.library_view.model().current_changed(current_idx,
|
|
||||||
current_idx)
|
|
||||||
|
|
||||||
if getattr(self._adder, 'merged_books', False):
|
if getattr(self._adder, 'merged_books', False):
|
||||||
books = u'\n'.join([x if isinstance(x, unicode) else
|
books = u'\n'.join([x if isinstance(x, unicode) else
|
||||||
@ -273,6 +267,14 @@ class AddAction(InterfaceAction):
|
|||||||
info_dialog(self.gui, _('Merged some books'),
|
info_dialog(self.gui, _('Merged some books'),
|
||||||
_('The following duplicate books were found and incoming book formats were '
|
_('The following duplicate books were found and incoming book formats were '
|
||||||
'processed and merged into your Calibre database according to your automerge settings:'), det_msg=books, show=True)
|
'processed and merged into your Calibre database according to your automerge settings:'), det_msg=books, show=True)
|
||||||
|
# The formats of the current book could have changed if
|
||||||
|
# automerge is enabled
|
||||||
|
current_idx = self.gui.library_view.currentIndex()
|
||||||
|
if current_idx.isValid():
|
||||||
|
self.gui.library_view.model().current_changed(current_idx,
|
||||||
|
current_idx)
|
||||||
|
|
||||||
|
|
||||||
if getattr(self._adder, 'critical', None):
|
if getattr(self._adder, 'critical', None):
|
||||||
det_msg = []
|
det_msg = []
|
||||||
for name, log in self._adder.critical.items():
|
for name, log in self._adder.critical.items():
|
||||||
|
Loading…
x
Reference in New Issue
Block a user