From 5bbcae954ed0f10793a9c4d9c1542ee4c4bf9210 Mon Sep 17 00:00:00 2001 From: chrox Date: Wed, 15 Jun 2016 02:34:46 +0800 Subject: [PATCH] fix #2060 by handling blank search pattern --- frontend/apps/reader/modules/readersearch.lua | 2 ++ frontend/document/koptinterface.lua | 1 + 2 files changed, 3 insertions(+) diff --git a/frontend/apps/reader/modules/readersearch.lua b/frontend/apps/reader/modules/readersearch.lua index af7274fab..04dd1a38f 100644 --- a/frontend/apps/reader/modules/readersearch.lua +++ b/frontend/apps/reader/modules/readersearch.lua @@ -75,6 +75,8 @@ function ReaderSearch:onShowSearchDialog(text) end function ReaderSearch:search(pattern, origin) + DEBUG("search pattern", pattern) + if pattern == nil or pattern == '' then return end local direction = self.direction local case = self.case_insensitive local page = self.view.state.page diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index 1b10fcbea..10b9aa42e 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -1087,6 +1087,7 @@ local function all_matches(boxes, pattern, caseInsensitive) local function match(i, j) local pindex = 1 local matched_indices = {} + if #plist == 0 then return end while true do if #boxes[i] < j then j = j - #boxes[i]