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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
This commit is contained in:
Jacek Jendrzej
2017-09-13 13:40:40 +02:00
parent 5d1ed28722 6310efb007
commit c44f82f12a
44 changed files with 349 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/start_wizard.cpp
View File

@@ -120,7 +120,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
res = g_videoSettings->exec(NULL, "");
g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_OFF);
}
if(!g_settings.easymenu && advanced && res != menu_return::RETURN_EXIT_ALL)
if(advanced && res != menu_return::RETURN_EXIT_ALL)
{
COsdSetup osdSettings(SNeutrinoSettings::WIZARD_ON);
res = osdSettings.exec(NULL, "");