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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
This commit is contained in:
vanhofen
2017-01-05 23:07:16 +01:00
parent e5df342b4f 91d2fa8784
commit edb884e756
15 changed files with 93 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/neutrino.cpp
View File

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