Unload loaded DBs before loading them again

This greatly simplifies handling DBs when changing states. No more
need to manage unloading in Client (except when exiting).

Reviewed-by: Thorbjørn Lindeijer

1 files changed, 8 insertions, 8 deletions

diff --git a/src/client.cpp b/src/client.cpp
index aa48591f..93450805 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -422,6 +422,14 @@ Client::~Client()
     SDL_RemoveTimer(mLogicCounterId);
     SDL_RemoveTimer(mSecondsCounterId);
 
+    // Unload XML databases
+    ColorDB::unload();
+    EmoteDB::unload();
+    ItemDB::unload();
+    MonsterDB::unload();
+    NPCDB::unload();
+    StatusEffect::unload();
+
     // Before config.write() since it writes the shortcuts to the config
     delete itemShortcut;
     delete emoteShortcut;
@@ -575,14 +583,6 @@ int Client::exec()
             {
                 delete game;
                 game = 0;
-
-                // Unload XML databases
-                ColorDB::unload();
-                EmoteDB::unload();
-                ItemDB::unload();
-                MonsterDB::unload();
-                NPCDB::unload();
-                StatusEffect::unload();
             }
 
             mOldState = mState;