Merge pull request #18 from xawen/refactor-ScanTimeoutTweak

Keep freq/ctcss scan results on screen until exit is pressed
fagci · Sep 28, 2023 · b35452e · b35452e
2 parents fee162e + 2ebf4c6
commit b35452e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/app.c b/app/app.c
@@ -1177,14 +1177,14 @@ void APP_TimeSlice500ms(void)
 						gAskToSave = false;
 						gAskToDelete = false;
 #if defined(ENABLE_FMRADIO)
-						if (gFmRadioMode && gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT) {
+						if (gFmRadioMode && gCurrentFunction != FUNCTION_RECEIVE && gCurrentFunction != FUNCTION_MONITOR && gCurrentFunction != FUNCTION_TRANSMIT)
 							GUI_SelectNextDisplay(DISPLAY_FM);
-						} else {
-							GUI_SelectNextDisplay(DISPLAY_MAIN);
-						}
-#else
-						GUI_SelectNextDisplay(DISPLAY_MAIN);
+						else
+#endif
+#if defined(ENABLE_NOSCANTIMEOUT)
+						if (gScreenToDisplay != DISPLAY_SCANNER)
 #endif
+							GUI_SelectNextDisplay(DISPLAY_MAIN);
 					}
 				}
 			}