Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-19 22:59:54 +02:00
parent 464a234940
commit a86bc779b4
251 changed files with 26673 additions and 443 deletions

View File

@@ -75,6 +75,11 @@ const CMenuOptionChooser::keyval WIZARD_SETUP_TYPE[] =
int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
{
//NI remove menu-timeout during wizard
int default_timing_menu = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
g_settings.timing[SNeutrinoSettings::TIMING_MENU] = 0;
//printf("[neutrino] Removing 'timing.menu' during wizard ...\n");
int res = menu_return::RETURN_REPAINT;
showBackgroundLogo();
@@ -167,6 +172,12 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
}
}
//NI reset menu-timeout to our default if user doesn't change the value
if (g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0) {
g_settings.timing[SNeutrinoSettings::TIMING_MENU] = default_timing_menu;
//printf("[neutrino] Set 'timing.menu' to default...\n");
}
killBackgroundLogo();
return res;
}