Additional checks for closing Scan&Select canned frame

meshtastic · Sep 6, 2024 · d983ca5 · d983ca5
1 parent 27f00cd
commit d983ca5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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