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

do not allow clipboard to be nil

Browse Source 
we use it as text anyway and test if it is the empty string also.

this fixes a crash in viewhtml when holding a selector with an empty clipboard, we try to contcate getClipboardText which is nil (on !SDL & !Android)
This commit is contained in:
yparitcher
2023-08-03 23:57:13 -04:00
parent 493a60faef
commit f3fc2ac353
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/device/input.lua
View File

@@ -98,7 +98,7 @@ local linux_evdev_rep_code_map = {
[C.REP_PERIOD] = "REP_PERIOD",
}
local _internal_clipboard_text = nil -- holds the last copied text
local _internal_clipboard_text = "" -- holds the last copied text
local Input = {
-- must point to the device implementation when instantiating
@@ -190,13 +190,13 @@ local Input = {
-- simple internal clipboard implementation, can be overidden to use system clipboard
hasClipboardText = function()
return _internal_clipboard_text ~= nil and _internal_clipboard_text ~= ""
return _internal_clipboard_text ~= ""
end,
getClipboardText = function()
return _internal_clipboard_text
end,
setClipboardText = function(text)
_internal_clipboard_text = text
_internal_clipboard_text = text or ""
end,
}

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

@@ -179,7 +179,7 @@ local function initTouchEvents()
end
end
local clipboard_value = Device.input.getClipboardText()
local is_clipboard_empty = clipboard_value == nil or clipboard_value == ""
local is_clipboard_empty = clipboard_value == ""
local clipboard_dialog
clipboard_dialog = require("ui/widget/textviewer"):new{
title = _("Clipboard"),