ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
Alayan
2018-09-25 23:50:10 +02:00
parent f0d862f472 4c6af1d381
commit 871ee40053
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/guiengine/engine.cpp
View File

@@ -974,21 +974,39 @@ namespace GUIEngine
if (ScreenKeyboard::isActive()) ScreenKeyboard::dismiss();
if (ModalDialog::isADialogActive()) ModalDialog::dismiss();
//delete g_font;
g_font->drop();
g_font = NULL;
//delete g_title_font;
g_title_font->drop();
g_title_font = NULL;
//delete g_small_font;
g_small_font->drop();
g_small_font = NULL;
g_large_font->drop();
g_large_font = NULL;
g_digit_font->drop();
g_digit_font = NULL;
g_outline_font->drop();
g_outline_font = NULL;
if (g_font)
{
//delete g_font;
g_font->drop();
g_font = NULL;
}
if (g_title_font)
{
//delete g_title_font;
g_title_font->drop();
g_title_font = NULL;
}
if (g_small_font)
{
//delete g_small_font;
g_small_font->drop();
g_small_font = NULL;
}
if (g_large_font)
{
g_large_font->drop();
g_large_font = NULL;
}
if (g_digit_font)
{
g_digit_font->drop();
g_digit_font = NULL;
}
if (g_outline_font)
{
g_outline_font->drop();
g_outline_font = NULL;
}
// nothing else to delete for now AFAIK, irrlicht will automatically
// kill everything along the device

3
src/main.cpp
View File

@@ -2338,6 +2338,9 @@ static void cleanSuperTuxKart()
if(unlock_manager) delete unlock_manager;
Online::ProfileManager::destroy();
GUIEngine::DialogQueue::deallocate();
GUIEngine::clear();
GUIEngine::cleanUp();
GUIEngine::clearScreenCache();
if(font_manager) delete font_manager;
// Now finish shutting down objects which a separate thread. The