diff options
| author | Johannes Schickel | 2012-05-03 13:45:40 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2012-05-03 13:45:40 -0700 |
| commit | b96143c1802b619553e476ad7a5a1eedeea0c768 (patch) | |
| tree | b810d8cb6722c5d45082f2d73b9f59e40bc58154 /base | |
| parent | e72f51129bfd11d0c926a2e21015a57740980928 (diff) | |
| parent | 29e05ec05eb85cc1402ebee2c399a4a45bcd4933 (diff) | |
| download | scummvm-rg350-b96143c1802b619553e476ad7a5a1eedeea0c768.tar.gz scummvm-rg350-b96143c1802b619553e476ad7a5a1eedeea0c768.tar.bz2 scummvm-rg350-b96143c1802b619553e476ad7a5a1eedeea0c768.zip | |
Merge pull request #213 from fuzzie/leak-fixes
The pull request in question is "Memory leak fixes".
Diffstat (limited to 'base')
| -rw-r--r-- | base/main.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/base/main.cpp b/base/main.cpp index c657488758..25e1b881cc 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -55,6 +55,12 @@ #include "audio/mididrv.h" #include "audio/musicplugin.h" /* for music manager */ +#include "graphics/cursorman.h" +#include "graphics/fontman.h" +#ifdef USE_FREETYPE2 +#include "graphics/fonts/ttf.h" +#endif + #include "backends/keymapper/keymapper.h" #if defined(_WIN32_WCE) @@ -493,10 +499,18 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { PluginManager::destroy(); GUI::GuiManager::destroy(); Common::ConfigManager::destroy(); + Common::DebugManager::destroy(); + Common::EventRecorder::destroy(); Common::SearchManager::destroy(); #ifdef USE_TRANSLATION Common::TranslationManager::destroy(); #endif + MusicManager::destroy(); + Graphics::CursorManager::destroy(); + Graphics::FontManager::destroy(); +#ifdef USE_FREETYPE2 + Graphics::shutdownTTF(); +#endif return 0; } |