From 47b0d4089a53f064bbfc9f8437608910c6b4aabe Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Tue, 12 Jan 2021 22:31:38 +0100 Subject: [PATCH] Remember the final rotation during Reboot/PowerOff/AutoSuspend, too (#7133) Re #7096, Fix #7125 Co-authored-by: yparitcher --- frontend/ui/uimanager.lua | 6 ++++-- reader.lua | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua index e1b1f7605..d76d59263 100644 --- a/frontend/ui/uimanager.lua +++ b/frontend/ui/uimanager.lua @@ -58,7 +58,8 @@ function UIManager:init() end, } self.poweroff_action = function() - self._entered_poweroff_stage = true; + self._entered_poweroff_stage = true + Device.orig_rotation_mode = Device.screen:getRotationMode() Screen:setRotationMode(Screen.ORIENTATION_PORTRAIT) require("ui/screensaver"):show("poweroff", _("Powered off")) if Device:needsScreenRefreshAfterResume() then @@ -74,7 +75,8 @@ function UIManager:init() end) end self.reboot_action = function() - self._entered_poweroff_stage = true; + self._entered_poweroff_stage = true + Device.orig_rotation_mode = Device.screen:getRotationMode() Screen:setRotationMode(Screen.ORIENTATION_PORTRAIT) require("ui/screensaver"):show("reboot", _("Rebooting…")) if Device:needsScreenRefreshAfterResume() then diff --git a/reader.lua b/reader.lua index 93f170060..fb7e046c1 100755 --- a/reader.lua +++ b/reader.lua @@ -339,8 +339,8 @@ local function exitReader() -- Save any device settings before closing G_reader_settings Device:saveSettings() - -- Save current rotation to have it for next startup - G_reader_settings:saveSetting("closed_rotation_mode", Device.screen:getRotationMode()) + -- Save current rotation (or the original rotation if ScreenSaver temporarily modified it) to remember it for next startup + G_reader_settings:saveSetting("closed_rotation_mode", Device.orig_rotation_mode or Device.screen:getRotationMode()) G_reader_settings:close()