From 6a06cfaea5313fdff6aa73b512064b1b25802c45 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 18 Jan 2015 00:58:08 +0800 Subject: [PATCH] refactor out flush settings when device goes into screensaver --- frontend/device/generic/device.lua | 4 ++++ frontend/ui/uimanager.lua | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/device/generic/device.lua b/frontend/device/generic/device.lua index 3a78029de..1793be962 100644 --- a/frontend/device/generic/device.lua +++ b/frontend/device/generic/device.lua @@ -1,3 +1,4 @@ +local Event = require("ui/event") local util = require("ffi/util") local DEBUG = require("dbg") @@ -69,10 +70,12 @@ function Device:getPowerDevice() end function Device:intoScreenSaver() + local UIManager = require("ui/uimanager") if self.charging_mode == false and self.screen_saver_mode == false then self.screen:saveCurrentBB() self.screen_saver_mode = true end + UIManager:sendEvent(Event:new("FlushSettings")) end function Device:outofScreenSaver() @@ -97,6 +100,7 @@ function Device:onPowerEvent(ev) self.screen:setRotationMode(0) Screensaver:show() self:prepareSuspend() + UIManager:sendEvent(Event:new("FlushSettings")) UIManager:scheduleIn(10, self.Suspend) elseif (ev == "Power" or ev == "Resume") and self.screen_saver_mode then DEBUG("Resuming...") diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua index 1f4f2531c..0ccac2850 100644 --- a/frontend/ui/uimanager.lua +++ b/frontend/ui/uimanager.lua @@ -39,7 +39,6 @@ function UIManager:init() } if Device:isKobo() then self.event_handlers["Suspend"] = function(input_event) - self:sendEvent(Event:new("FlushSettings")) Device:onPowerEvent(input_event) end self.event_handlers["Resume"] = function(input_event) @@ -64,7 +63,6 @@ function UIManager:init() end elseif Device:isKindle() then self.event_handlers["IntoSS"] = function() - self:sendEvent(Event:new("FlushSettings")) Device:intoScreenSaver() end self.event_handlers["OutOfSS"] = function()