From 2c794839db8906659f17b2708cd42e2c5be568aa Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 28 Feb 2020 18:27:56 +0530 Subject: [PATCH] Forgot to report hidden search results --- src/calibre/gui2/viewer/search.py | 4 ++-- src/pyj/read_book/iframe.pyj | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/viewer/search.py b/src/calibre/gui2/viewer/search.py index 50dcac5df3..c33a1d3646 100644 --- a/src/calibre/gui2/viewer/search.py +++ b/src/calibre/gui2/viewer/search.py @@ -401,8 +401,8 @@ class Results(QListWidget): # {{{ break r.index -= 1 self.takeItem(remove) - if remove < self.count(): - self.setCurrentRow(remove) + if self.count(): + self.setCurrentRow(min(remove, self.count()-1)) self.item_activated() # }}} diff --git a/src/pyj/read_book/iframe.pyj b/src/pyj/read_book/iframe.pyj index 40f55f0bcf..b5a2d7c883 100644 --- a/src/pyj/read_book/iframe.pyj +++ b/src/pyj/read_book/iframe.pyj @@ -583,6 +583,8 @@ class IframeBoss: if select_search_result(data.search_result): if current_layout_mode() is not 'flow': snap_to_selection() + else: + self.send_message('search_result_not_found', search_result=data.search_result) def reference_item_changed(self, ref_num_or_none): self.send_message('reference_item_changed', refnum=ref_num_or_none, index=current_spine_item().index)