renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ReaderDictionary: fix possible crash with Wikipedia

Browse Source 
Also reword some "...canceled" to "...interrupted"
for consistency.
This commit is contained in:
poire-z
2021-01-09 21:59:27 +01:00
parent 1f2447dc06
commit 9ec3dcb376
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/apps/reader/modules/readerdictionary.lua
View File

@@ -914,7 +914,7 @@ function ReaderDictionary:showDict(word, results, box, link)
self:dismissLookupInfo()
if results and results[1] then
UIManager:show(self.dict_window)
if not results.lookup_cancelled and ffiUtil.getDuration(self._lookup_start_ts) > self.quick_dismiss_before_delay then
if not results.lookup_cancelled and self._lookup_start_ts and ffiUtil.getDuration(self._lookup_start_ts) > self.quick_dismiss_before_delay then
-- If the search took more than a few seconds to be done, discard
-- queued and coming up events to avoid a voluntary dismissal
-- (because the user felt the result would not come) to kill the

2
frontend/apps/reader/modules/readerwikipedia.lua
View File

@@ -502,7 +502,7 @@ function ReaderWikipedia:lookupWikipedia(word, is_sane, box, get_fullpage, force
-- dummy results
local definition
if lookup_cancelled then
definition = _("Wikipedia request canceled.")
definition = _("Wikipedia request interrupted.")
elseif ok then
definition = no_result_text
else

2
frontend/ui/widget/dictquicklookup.lua
View File

@@ -430,7 +430,7 @@ function DictQuickLookup:update()
})
else
UIManager:show(InfoMessage:new{
text = _("Saving Wikipedia article failed or canceled."),
text = _("Saving Wikipedia article failed or interrupted."),
})
end
end)