ui/menu.c: Simplify code; move name printing into main switch statement.

This saves a few bytes of flash.
wutje · Dec 29, 2023 · 12f8551 · 12f8551
1 parent 9042ebc
commit 12f8551
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/ui/menu.c b/ui/menu.c
@@ -649,6 +649,8 @@ void UI_DisplayMenu(void)
 				UI_PrintString(String, menu_item_x1, menu_item_x2, 4, 8);
 			}
 
+			SETTINGS_FetchChannelName(String, gSubMenuSelection);
+			UI_PrintString(String[0] ? String : "--", menu_item_x1, menu_item_x2, 2, 8);
 			already_printed = true;
 			break;
 		}
@@ -928,15 +930,6 @@ void UI_DisplayMenu(void)
 		}
 	}
 
-	if (UI_MENU_GetCurrentMenuId() == MENU_MEM_CH   ||
-	    UI_MENU_GetCurrentMenuId() == MENU_DEL_CH   ||
-	    UI_MENU_GetCurrentMenuId() == MENU_1_CALL)
-	{	// display the channel name
-		char s[11];
-		SETTINGS_FetchChannelName(s, gSubMenuSelection);
-		UI_PrintString(s[0] ? s : "--", menu_item_x1, menu_item_x2, 2, 8);
-	}
-
 	if ((UI_MENU_GetCurrentMenuId() == MENU_R_CTCS || UI_MENU_GetCurrentMenuId() == MENU_R_DCS) && gCssBackgroundScan)
 		UI_PrintString("SCAN", menu_item_x1, menu_item_x2, 4, 8);