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

FBFontRenderClass/CNeutrinoFonts: ensure reset of some instances

Browse Source 
Only for safety.
This commit is contained in:
Thilo Graf
2017-06-15 01:01:54 +02:00
parent 5573d17cce
commit 71d0c42a47
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/fontrenderer.cpp
View File

@@ -99,7 +99,7 @@ FBFontRenderClass::~FBFontRenderClass()
for (fontListEntry * f = font; f; f = g)
{
g = f->next;
delete f;
delete f; f = NULL;
}
FTC_Manager_Done(cacheManager);

12
src/driver/neutrinofonts.cpp
View File

@@ -92,14 +92,18 @@ void CNeutrinoFonts::InitDynFonts()
CNeutrinoFonts::~CNeutrinoFonts()
{
if (!v_share_fonts.empty()) {
for (unsigned int i = 0; i < v_share_fonts.size(); i++)
for (unsigned int i = 0; i < v_share_fonts.size(); i++){
delete v_share_fonts[i].font;
v_share_fonts[i].font = NULL;
}
v_share_fonts.clear();
}
if (!v_dyn_fonts.empty()) {
for (unsigned int i = 0; i < v_dyn_fonts.size(); i++)
for (unsigned int i = 0; i < v_dyn_fonts.size(); i++){
delete v_dyn_fonts[i].font;
v_dyn_fonts[i].font = NULL;
}
v_dyn_fonts.clear();
}
if (!vDynSize.empty()) {
@@ -402,8 +406,10 @@ void CNeutrinoFonts::deleteDynFontExtAll()
{
if (!v_dyn_fonts_ext.empty()) {
for (size_t i = 0; i < v_dyn_fonts_ext.size(); ++i) {
if (v_dyn_fonts_ext[i].font != NULL)
if (v_dyn_fonts_ext[i].font != NULL){
delete v_dyn_fonts_ext[i].font;
v_dyn_fonts_ext[i].font = NULL;
}
}
v_dyn_fonts_ext.clear();
}