Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 6e4c63f289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-13 (Fri, 13 Jan 2017)
This commit is contained in:
vanhofen
2017-01-13 13:27:49 +01:00
37 changed files with 177 additions and 107 deletions

View File

@@ -2403,7 +2403,6 @@ TIMER_START();
frameBuffer->stopFrame();
}
InitZapper();
if(loadSettingsErg) {
hintBox->hide();
dprintf(DEBUG_INFO, "config file or options missing\n");
@@ -2413,6 +2412,8 @@ TIMER_START();
saveSetup(NEUTRINO_SETTINGS_FILE);
}
InitZapper();
CHDDDestExec * hdd = new CHDDDestExec();
hdd->exec(NULL, "");
delete hdd;