From 719026d69b130072b00d39e2ba574798025329a7 Mon Sep 17 00:00:00 2001
From: Todd Herbert <herbert.todd@gmail.com>
Date: Tue, 26 Mar 2024 00:35:04 +1300
Subject: [PATCH] adapt drawDeepSleepScreen to new screensaver convention

---
 src/graphics/Screen.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 1a34ee7412..e00f1dcf1e 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -266,6 +266,7 @@ static void drawDeepSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state,
 
     LOG_DEBUG("Drawing deep sleep screen\n");
     drawIconScreen("Sleeping...", display, state, x, y);
+    screen->forceDisplay();
 }
 
 /// Used on eink displays when screen turns off for powersaving
@@ -1418,6 +1419,7 @@ void Screen::handleShutdownScreen()
     LOG_DEBUG("showing shutdown screen\n");
     showingNormalScreen = false;
     EINK_ADD_FRAMEFLAG(dispdev, DEMAND_FAST); // E-Ink: Explicitly use fast-refresh for next frame
+    EINK_ADD_FRAMEFLAG(dispdev, BLOCKING);    // Edge case: if this frame is also flagged cosmetic, wait for update
 
     auto frame = [](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
         drawFrameText(display, state, x, y, "Shutting down...");