From 46ef75daf2d6ed586f099861d4de4ec0fd627357 Mon Sep 17 00:00:00 2001
From: Dual Tachyon <N/A>
Date: Wed, 13 Sep 2023 14:35:40 +0100
Subject: [PATCH] Reapplied fix that was lost during a conflict.

---
 app/app.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/app.c b/app/app.c
index 0567b1f1..53353a4d 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1124,18 +1124,18 @@ void APP_TimeSlice500ms(void)
 #if defined(ENABLE_FMRADIO)
 			(gFM_ScanState == FM_SCAN_OFF || gAskToSave) &&
 #endif
-			gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF) {
+			gCssScanMode == CSS_SCAN_MODE_OFF) {
 			if (gBacklightCountdown) {
 				gBacklightCountdown--;
 				if (gBacklightCountdown == 0) {
 					GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
 				}
 			}
-			if (
+			if (gScanState == SCAN_OFF
 #if defined(ENABLE_AIRCOPY)
-				gScreenToDisplay != DISPLAY_AIRCOPY &&
+				&& gScreenToDisplay != DISPLAY_AIRCOPY
 #endif
-				(gScreenToDisplay != DISPLAY_SCANNER || (gScanCssState >= SCAN_CSS_STATE_FOUND))) {
+				&& (gScreenToDisplay != DISPLAY_SCANNER || (gScanCssState >= SCAN_CSS_STATE_FOUND))) {
 				if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown && !gDTMF_InputMode) {
 					gKeyLockCountdown--;
 					if (gKeyLockCountdown == 0) {