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

- neutrinofonts: introduce fixed (non user scalable) fonts

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-03-08 23:16:46 +01:00
committed by Thilo Graf
parent 7426845feb
commit 8329304a48
4 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/neutrino.cpp
View File

@@ -4703,6 +4703,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
delete g_Sectionsd;
delete g_RemoteControl;
delete g_fontRenderer;
delete g_fixedFontRenderer;
delete g_dynFontRenderer;
delete g_shellFontRenderer;
@@ -5250,6 +5251,7 @@ void CNeutrinoApp::Cleanup()
printf("cleanup 11\n");fflush(stdout);
delete g_fontRenderer; g_fontRenderer = NULL;
delete g_fixedFontRenderer; g_fixedFontRenderer = NULL;
delete g_dynFontRenderer; g_dynFontRenderer = NULL;
delete g_shellFontRenderer; g_shellFontRenderer = NULL;
printf("cleanup 12\n");fflush(stdout);
@@ -5291,20 +5293,25 @@ void CNeutrinoApp::Cleanup()
delete RADIOsatList; RADIOsatList = NULL;
printf("cleanup 1\n");fflush(stdout);
for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) {
for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++)
{
delete g_Font[i];
g_Font[i] = NULL;
}
for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_FIXED_COUNT; i++)
{
delete g_FixedFont[i];
g_FixedFont[i] = NULL;
}
delete g_SignalFont; g_SignalFont = NULL;
delete g_ShellFont; g_ShellFont = NULL;
printf("cleanup 2\n");fflush(stdout);
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;
delete g_ShellFont; g_ShellFont = NULL;
printf("cleanup 3\n");fflush(stdout);
configfile.clear();
printf("cleanup 4\n");fflush(stdout);
delete CZapit::getInstance();
printf("cleanup 5\n");fflush(stdout);