From 48c474e245d79fce3dfc73dcbbee5e6a1ca1e40c Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Fri, 7 May 2021 19:27:25 +0200 Subject: [PATCH] Device: Add some more logging in onPowerEvent Could possibly help shed some light on potential SleepCover races... re #7633 --- frontend/device/generic/device.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/device/generic/device.lua b/frontend/device/generic/device.lua index ca3121adc..7a6ea47e3 100644 --- a/frontend/device/generic/device.lua +++ b/frontend/device/generic/device.lua @@ -270,6 +270,8 @@ function Device:onPowerEvent(ev) self.powerd:beforeSuspend() local UIManager = require("ui/uimanager") logger.dbg("Suspending...") + -- Add the current state of the SleepCover flag... + logger.dbg("Sleep cover is", self.is_cover_closed and "closed" or "open") -- Let Screensaver set its widget up, so we get accurate info down the line in case fallbacks kick in... Screensaver:setup() -- Mostly always suspend in Portrait/Inverted Portrait mode... @@ -325,7 +327,11 @@ function Device:onPowerEvent(ev) network_manager:turnOffWifi() end end - UIManager:scheduleIn(self.suspend_wait_timeout, self.suspend) + -- Only actually schedule suspension if we're still supposed to go to sleep, + -- because the Wi-Fi stuff above may have blocked for a significant amount of time... + if self.screen_saver_mode then + UIManager:scheduleIn(self.suspend_wait_timeout, self.suspend) + end end) end end