[fix] Allow default FM rotation on init when Keep FM rotation is disabled (#6348)

This commit is contained in:
yparitcher
2020-07-05 11:34:44 -04:00
committed by GitHub
parent 8a61e70fad
commit 8f2399caa9
2 changed files with 6 additions and 3 deletions

View File

@@ -70,10 +70,12 @@ function FileManager:onSetRotationMode(rotation)
return true
end
function FileManager:setRotationMode()
-- init should be set to True when starting the FM for the first time
-- (not coming from the reader). This allows the default to be properly set.
function FileManager:setRotationMode(init)
local locked = G_reader_settings:readSetting("lock_rotation")
local rotation_mode = G_reader_settings:readSetting("fm_rotation_mode") or 0
if locked then
local rotation_mode = G_reader_settings:readSetting("fm_rotation_mode") or Screen.ORIENTATION_PORTRAIT
if locked or init then
self:onSetRotationMode(rotation_mode)
end
end

View File

@@ -277,6 +277,7 @@ if ARGV[argidx] and ARGV[argidx] ~= "" then
local home_dir =
G_reader_settings:readSetting("home_dir") or ARGV[argidx]
UIManager:nextTick(function()
FileManager:setRotationMode(true)
FileManager:showFiles(home_dir)
end)
-- always open history on top of filemanager so closing history