mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp

Browse Source 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp
This commit is contained in:
TangoCash
2017-03-15 22:47:42 +01:00
parent cf126eb761 f974b56343
commit 81fb3b42fa
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neutrino.cpp
View File

@@ -906,7 +906,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() ||
@@ -4848,6 +4851,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);