From 25a11bb7d78d8ff6f2e9a5d6595a05bc6b67bb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 31 Jul 2024 12:27:38 +0000 Subject: [PATCH] Forbid LcdUpdateDisabler to call lcd_update() The fixes a scenario where: lcd_status_screen() calls lcd_commands() upon exiting lcd_show_fullscreen_message_and_wait_P(_T(MSG_NOZZLE_CNG_READ_HELP)); and so not allowing the user to leave the screen since it will keep being rendered endlessly. This change only affects lcd_show_fullscreen_message_and_wait_P --- Firmware/lcd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 897195070..031887cc0 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -111,18 +111,18 @@ extern void lcd_buttons_update(void); //! When constructed (on stack), original state state of lcd_update_enabled is stored //! and LCD updates are disabled. //! When destroyed (gone out of scope), original state of LCD update is restored. -//! It has zero overhead compared to storing bool saved = lcd_update_enabled -//! and calling lcd_update_enable(false) and lcd_update_enable(saved). +//! Do not call lcd_update_enable() to prevent calling lcd_update() in sensitive code. +//! in certain scenarios it will cause recursion e.g. in the menus. class LcdUpdateDisabler { public: LcdUpdateDisabler(): m_updateEnabled(lcd_update_enabled) { - lcd_update_enable(false); + lcd_update_enabled = false; } ~LcdUpdateDisabler() { - lcd_update_enable(m_updateEnabled); + lcd_update_enabled = m_updateEnabled; } private: