1 files changed, 8 insertions, 8 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 44df362e..8d916add 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -435,14 +435,6 @@ Client::~Client()
     // Shutdown sound
     sound.close();
 
-    // Unload XML databases
-    ColorDB::unload();
-    EmoteDB::unload();
-    ItemDB::unload();
-    MonsterDB::unload();
-    NPCDB::unload();
-    StatusEffect::unload();
-
     ResourceManager::deleteInstance();
 
     SDL_FreeSurface(mIcon);
@@ -583,6 +575,14 @@ int Client::exec()
             {
                 delete game;
                 game = 0;
+
+                // Unload XML databases
+                ColorDB::unload();
+                EmoteDB::unload();
+                ItemDB::unload();
+                MonsterDB::unload();
+                NPCDB::unload();
+                StatusEffect::unload();
             }
 
             mOldState = mState;