mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 02:11:04 +02:00
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:
@@ -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;
|
||||
|
Reference in New Issue
Block a user