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

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

Browse Source 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-15 23:39:43 +01:00
parent ca99393430 9da6d922dd
commit 45f0ad7d7e
42 changed files with 241 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neutrino.cpp
View File

@@ -958,7 +958,10 @@ int CNeutrinoApp::loadSetup(const char * fname)
// USERMENU -> in system/settings.h
//-------------------------------------------
for(unsigned int i=0; i<g_settings.usermenu.size();++i){
delete g_settings.usermenu[i];
g_settings.usermenu[i] = NULL;
}
g_settings.usermenu.clear();
if (configfile.getString("usermenu_key_red", "").empty() ||
configfile.getString("usermenu_key_green", "").empty() ||
@@ -5229,6 +5232,10 @@ void CNeutrinoApp::Cleanup()
delete g_Font[i];
g_Font[i] = NULL;
}
for(unsigned int i=0; i<g_settings.usermenu.size();++i){
delete g_settings.usermenu[i];
g_settings.usermenu[i] = NULL;
}
printf("cleanup 2\n");fflush(stdout);
delete g_SignalFont; g_SignalFont = NULL;
printf("cleanup 3\n");fflush(stdout);