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

[fix] Try to make screensaver settings slightly less error-prone (#5460)

Browse Source 
Regression inadvertently caused by #5369.

With the way this is constructed, this is almost guaranteed to happen.

Fixes #5459.
This commit is contained in:
Frans de Jonge
2019-10-07 17:46:09 +02:00
committed by GitHub
parent 0fa1b44782
commit 1db7f2e444
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/apps/reader/modules/readermenu.lua
View File

@@ -175,7 +175,11 @@ function ReaderMenu:setUpdateItemTable()
text = _("Screensaver"),
sub_item_table = require("ui/elements/screensaver_menu"),
}
table.remove(self.menu_items.screensaver.sub_item_table, 9)
local table_len = #self.menu_items.screensaver.sub_item_table
--- @todo Make this less prone to being messed up by screensaver menu changes, for example with MenuSorter.
if self.menu_items.screensaver.sub_item_table[table_len].text == ss_book_settings.text then
table.remove(self.menu_items.screensaver.sub_item_table, table_len)
end
table.insert(self.menu_items.screensaver.sub_item_table, ss_book_settings)
end
@@ -348,10 +352,11 @@ end
function ReaderMenu:onCloseDocument()
if Device:supportsScreensaver() then
-- Remove the 9th item we added (which cleans up references to document
--- @todo Make this less prone to being messed up by screensaver menu changes, for example with MenuSorter.
-- Remove the item we added (which cleans up references to document
-- and doc_settings embedded in functions)
local screensaver_sub_item_table = require("ui/elements/screensaver_menu")
table.remove(screensaver_sub_item_table, 9)
table.remove(screensaver_sub_item_table, #screensaver_sub_item_table)
end
end