mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-16 14:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add destroy_default_font() to avoid memory leak of the default font.

Browse Source
This commit is contained in:
David Capello 2010-10-26 15:23:04 -07:00
parent 3683e778d1
commit 2aab911196
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/gui.cpp
View File

@ -147,6 +147,7 @@ static JList icon_buttons;
static bool double_buffering; static bool double_buffering;
static int screen_scaling; static int screen_scaling;
static void destroy_default_font();
static void reload_default_font(); static void reload_default_font();
/* load & save graphics configuration */ /* load & save graphics configuration */
@ -357,6 +358,11 @@ void exit_module_gui()
icon_buttons = NULL; icon_buttons = NULL;
jmanager_free(manager); jmanager_free(manager);
// Destroy the default font of the current theme
destroy_default_font();
// Now we can destroy theme
ji_set_theme(NULL); ji_set_theme(NULL);
delete ase_theme; delete ase_theme;
@ -593,17 +599,24 @@ void gui_setup_screen(bool reload_font)
save_gui_config(); save_gui_config();
} }
static void reload_default_font() static void destroy_default_font()
{ {
JTheme theme = ji_get_theme(); JTheme theme = ji_get_theme();
SkinneableTheme* skinneable_theme = static_cast<SkinneableTheme*>(theme);
const char *user_font;
// No font for now // No font for now
if (theme->default_font && theme->default_font != font) if (theme->default_font && theme->default_font != font)
destroy_font(theme->default_font); destroy_font(theme->default_font);
theme->default_font = NULL; theme->default_font = NULL;
}
static void reload_default_font()
{
JTheme theme = ji_get_theme();
SkinneableTheme* skinneable_theme = static_cast<SkinneableTheme*>(theme);
const char *user_font;
destroy_default_font();
// Directories // Directories
ResourceFinder rf; ResourceFinder rf;