Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: dbc51bb77d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-06-02 22:21:53 +02:00
2 changed files with 6 additions and 2 deletions

View File

@@ -1343,7 +1343,11 @@ int CMovieBrowser::paint(void)
refreshLCD(); refreshLCD();
if (m_settings.gui == MB_GUI_FILTER) if (m_settings.gui == MB_GUI_FILTER)
m_settings.gui = MB_GUI_MOVIE_INFO; m_settings.gui = MB_GUI_MOVIE_INFO;
onSetGUIWindow(m_settings.gui); if (show_mode == MB_SHOW_YT)
onSetGUIWindow(MB_GUI_MOVIE_INFO);
else
onSetGUIWindow(m_settings.gui);
return (true); return (true);
} }

View File

@@ -236,7 +236,7 @@ int CRecordSetup::showRecordSetup()
// already_found // already_found
CMenuOptionChooser* already_found = new CMenuOptionChooser(LOCALE_RECORDINGMENU_ALREADY_FOUND_CHECK, &g_settings.recording_already_found_check, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); CMenuOptionChooser* already_found = new CMenuOptionChooser(LOCALE_RECORDINGMENU_ALREADY_FOUND_CHECK, &g_settings.recording_already_found_check, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
already_found->setHint(NEUTRINO_ICON_HINT_IMAGELOGO, LOCALE_MENU_HINT_RECORD_ALREADY_FOUND_CHECK); already_found->setHint("", LOCALE_MENU_HINT_RECORD_ALREADY_FOUND_CHECK);
recordingSettings->addItem(already_found); recordingSettings->addItem(already_found);
if (!g_settings.easymenu) { if (!g_settings.easymenu) {