Fix #1282898 [Broken Edit Metadata in Bulk commits 1.25.0](https://bugs.launchpad.net/calibre/+bug/1282898)

This commit is contained in:
Kovid Goyal 2014-02-21 13:14:01 +05:30
parent 84057eb3be
commit 70d96e7a07

View File

@ -943,8 +943,13 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
self.save_state() self.save_state()
if len(self.ids) < 1: if len(self.ids) < 1:
return QDialog.accept(self) return QDialog.accept(self)
try:
source = self.s_r_sf_itemdata(None)
except:
source = ''
do_sr = source and self.s_r_obj
if self.s_r_error is not None: if self.s_r_error is not None and do_sr:
error_dialog(self, _('Search/replace invalid'), error_dialog(self, _('Search/replace invalid'),
_('Search pattern is invalid: %s')%self.s_r_error.message, _('Search pattern is invalid: %s')%self.s_r_error.message,
show=True) show=True)
@ -1007,8 +1012,6 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
pubdate, adddate, do_title_sort, languages, clear_languages, pubdate, adddate, do_title_sort, languages, clear_languages,
restore_original, self.comments) restore_original, self.comments)
source = self.s_r_sf_itemdata(None)
do_sr = source and self.s_r_obj
self.set_field_calls = defaultdict(dict) self.set_field_calls = defaultdict(dict)
bb = MyBlockingBusy(args, self.ids, self.db, self.refresh_books, bb = MyBlockingBusy(args, self.ids, self.db, self.refresh_books,
getattr(self, 'custom_column_widgets', []), getattr(self, 'custom_column_widgets', []),