mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
parent c47d8a8f9d b08d6cf967
commit b0077cafc5
114 changed files with 7292 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/start_wizard.cpp
View File

@@ -115,7 +115,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
res = g_videoSettings->exec(NULL, "");
g_videoSettings->setWizardMode(CVideoSettings::V_SETUP_MODE_WIZARD_NO);
}
if(advanced && res != menu_return::RETURN_EXIT_ALL)
if(!g_settings.easymenu && advanced && res != menu_return::RETURN_EXIT_ALL)
{
COsdSetup osdSettings(COsdSetup::OSD_SETUP_MODE_WIZARD);
res = osdSettings.exec(NULL, "");
@@ -144,7 +144,9 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
{
CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD);
if (advanced) {
res = CScanSetup::getInstance()->exec(NULL, "");
res = CScanSetup::getInstance()->exec(NULL, "setup_frontend");
if(res != menu_return::RETURN_EXIT_ALL)
res = CScanSetup::getInstance()->exec(NULL, "");
} else {
CZapit::getInstance()->GetConfig(zapitCfg);
#ifdef ENABLE_FASTSCAN