1 files changed, 7 insertions, 0 deletions
diff --git a/src/shared/gameinfo.cpp b/src/shared/gameinfo.cpp
index 6b53450d..f74e52b4 100644
--- a/src/shared/gameinfo.cpp
+++ b/src/shared/gameinfo.cpp
@@ -40,6 +40,13 @@ GameInfo* GameInfo::s_Instance = NULL;
 GameInfo::GameInfo(const std::wstring &omoDirectory, const std::wstring &gameDirectory)
   : m_GameDirectory(gameDirectory), m_OrganizerDirectory(omoDirectory)
 {
+  atexit(&cleanup);
+}
+
+
+void GameInfo::cleanup() {
+  delete GameInfo::s_Instance;
+  GameInfo::s_Instance = NULL;
 }