From d983ca5e6ccbf1a223e3bf4ffc2a1b07cf682aa3 Mon Sep 17 00:00:00 2001 From: Robert Fisk Date: Wed, 14 Aug 2024 04:16:05 -0400 Subject: [PATCH] Additional checks for closing Scan&Select canned frame --- src/graphics/Screen.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index a6b4f9cbe..d2d6047b4 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -2315,7 +2315,9 @@ void Screen::handleOnPress() { // If Canned Messages is using the "Scan and Select" input, dismiss the canned message frame when user button is pressed // Minimize impact as a courtesy, as "scan and select" may be used as default config for some boards - if (scanAndSelectInput != nullptr && scanAndSelectInput->dismissCannedMessageFrame()) + // (Fall-through if using auto carousel, to prevent unexpected closing of canned message frame) + if (scanAndSelectInput != nullptr && !config.display.auto_screen_carousel_secs && + scanAndSelectInput->dismissCannedMessageFrame()) return; // Don't transition away from canned messages if it is active