Merge remote-tracking branch 'check/next-cc'

This commit is contained in:
Stefan Seyfried
2014-01-12 14:41:44 +01:00
29 changed files with 620 additions and 520 deletions

View File

@@ -2352,11 +2352,9 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
// eventlist
if (g_settings.personalize[SNeutrinoSettings::P_MAIN_RED_BUTTON] == CPersonalizeGui::PERSONALIZE_ACTIVE_MODE_ENABLED)// EventList Menu - Personalization Check
{
InfoClock->enableInfoClock(false);
StopSubtitles();
usermenu.showUserMenu(SNeutrinoSettings::BUTTON_RED);
StartSubtitles();
InfoClock->enableInfoClock(true);
}
else
ShowHintUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_PERSONALIZE_MENUDISABLEDHINT),450, 10);