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

Screensaver: avoid crash when no lastfile

Browse Source
This commit is contained in:
poire-z
2019-11-24 16:18:23 +01:00
parent d8e0b1759b
commit f410315f83
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/ui/screensaver.lua
View File

@@ -261,7 +261,7 @@ function Screensaver:show(event, fallback_message)
exclude = doc_settings:readSetting("exclude_screensaver")
end
if exclude ~= true then
if lfs.attributes(lastfile, "mode") == "file" then
if lastfile and lfs.attributes(lastfile, "mode") == "file" then
local doc = DocumentRegistry:openDocument(lastfile)
if doc.loadDocument then -- CreDocument
doc:loadDocument(false) -- load only metadata
@@ -287,7 +287,7 @@ function Screensaver:show(event, fallback_message)
end
end
if screensaver_type == "bookstatus" then
if lfs.attributes(lastfile, "mode") == "file" then
if lastfile and lfs.attributes(lastfile, "mode") == "file" then
local doc = DocumentRegistry:openDocument(lastfile)
local doc_settings = DocSettings:open(lastfile)
local instance = require("apps/reader/readerui"):_getRunningInstance()
@@ -410,9 +410,9 @@ function Screensaver:expandSpecial(message, fallback)
local ret = message
local lastfile = G_reader_settings:readSetting("lastfile")
local doc = DocumentRegistry:openDocument(lastfile)
local instance = require("apps/reader/readerui"):_getRunningInstance()
if instance ~= nil then
if lastfile and lfs.attributes(lastfile, "mode") == "file" and instance ~= nil then
local doc = DocumentRegistry:openDocument(lastfile)
local currentpage = instance.view.state.page
ret = string.gsub(ret, "%%c", currentpage)
@@ -424,10 +424,10 @@ function Screensaver:expandSpecial(message, fallback)
local props = doc:getProps()
ret = string.gsub(ret, "%%T", props.title)
doc:close()
else
ret = fallback
end
doc:close()
return ret
end