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 screensaver menu stability (#5499)

Browse Source 
With some particular document switching workflows, the
screensaver menu could lose its last item, and shrink
to having zero item, and eventually cause a crash.
This commit is contained in:
poire-z
2019-10-17 15:03:40 +02:00
committed by GitHub
parent bae69c0ef3
commit 240b75ac50
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,19 +168,21 @@ function ReaderMenu:setUpdateItemTable()
self.ui.doc_settings:saveSetting("exclude_screensaver", true)
end
self.ui:saveSettings()
end
end,
added_by_readermenu_flag = true,
}
local screensaver_sub_item_table = require("ui/elements/screensaver_menu")
-- Before inserting this new item, remove any previously added one
for i = #screensaver_sub_item_table, 1, -1 do
if screensaver_sub_item_table[i].added_by_readermenu_flag then
table.remove(screensaver_sub_item_table, i)
end
end
table.insert(screensaver_sub_item_table, ss_book_settings)
self.menu_items.screensaver = {
text = _("Screensaver"),
sub_item_table = require("ui/elements/screensaver_menu"),
sub_item_table = screensaver_sub_item_table,
}
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
local PluginLoader = require("pluginloader")
@@ -352,11 +354,14 @@ end
function ReaderMenu:onCloseDocument()
if Device:supportsScreensaver() then
--- @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, #screensaver_sub_item_table)
for i = #screensaver_sub_item_table, 1, -1 do
if screensaver_sub_item_table[i].added_by_readermenu_flag then
table.remove(screensaver_sub_item_table, i)
end
end
end
end