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).


Origin commit data
------------------
Branch: ni/coolstream
Commit: c617f764ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- 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).


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-01-02 11:54:08 +01:00
parent d8269b9be5
commit 4a9d983042

View File

@@ -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 */