From c617f764abc1b347915b6ef7f3f7a7675a8574fb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 2 Jan 2016 11:54:08 +0100 Subject: [PATCH] - neutrino: don't autofill usermenu title, when no items included This keeps init-code compatible to personalize-code (title is removed automatically, when no items are included). --- src/neutrino.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index b98cc91f7..871f09e5d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1903,13 +1903,13 @@ TIMER_START(); } // default usermenu titles correspond to gui/user_menue_setup.h:struct usermenu_props_t usermenu - if (g_settings.usermenu[0]->title.empty()) + if (g_settings.usermenu[0]->title.empty() && !g_settings.usermenu[0]->items.empty()) g_settings.usermenu[0]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_RED); - if (g_settings.usermenu[1]->title.empty()) + if (g_settings.usermenu[1]->title.empty() && !g_settings.usermenu[1]->items.empty()) g_settings.usermenu[1]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_GREEN); - if (g_settings.usermenu[2]->title.empty()) + if (g_settings.usermenu[2]->title.empty() && !g_settings.usermenu[2]->items.empty()) g_settings.usermenu[2]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_YELLOW); - if (g_settings.usermenu[3]->title.empty()) + if (g_settings.usermenu[3]->title.empty() && !g_settings.usermenu[3]->items.empty()) g_settings.usermenu[3]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_BLUE); /* setup GUI */