From 532a3fb058f904292d69b807959d801d27422525 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Tue, 10 Dec 2024 01:50:43 +0100
Subject: [PATCH] Status refactoring

---
 ui/status.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/ui/status.c b/ui/status.c
index 01e8e58..c2f21f7 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -61,23 +61,27 @@ void UI_DisplayStatus()
 
     uint8_t     *line = gStatusLine;
     unsigned int x    = 0;
-    // **************
 
-    // POWER-SAVE indicator
+#ifdef ENABLE_NOAA
+    // NOAA indicator
+    if (!(gScanStateDir != SCAN_OFF || SCANNER_IsScanning()) && gIsNoaaMode) { // NOASS SCAN indicator
+        memcpy(line + x, BITMAP_NOAA, sizeof(BITMAP_NOAA));
+    }
+    // Power Save indicator
+    else if (gCurrentFunction == FUNCTION_POWER_SAVE) {
+        memcpy(line + x, gFontPowerSave, sizeof(gFontPowerSave));
+    }
+    x += 8;
+#else
+    // Power Save indicator
     if (gCurrentFunction == FUNCTION_POWER_SAVE) {
         memcpy(line + x, gFontPowerSave, sizeof(gFontPowerSave));
     }
     x += 8;
-    unsigned int x1 = x;
-
-#ifdef ENABLE_NOAA
-    if (gIsNoaaMode) { // NOASS SCAN indicator
-        memcpy(line + x, BITMAP_NOAA, sizeof(BITMAP_NOAA));
-        x1 = x + sizeof(BITMAP_NOAA);
-    }
-    x += sizeof(BITMAP_NOAA);
 #endif
 
+    unsigned int x1 = x;
+
 #ifdef ENABLE_DTMF_CALLING
     if (gSetting_KILLED) {
         memset(line + x, 0xFF, 10);