Load the databases at the start of the LOGIN state, after the updates are

loaded.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index b91e34cc..f914af47 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -37,11 +37,15 @@ namespace
 {

     ItemDB::ItemInfos mItemInfos;

     ItemInfo mUnknown;

+    bool mLoaded = false;

 }

 

 

 void ItemDB::load()

 {

+    if (mLoaded)

+        return;

+

     logger->log("Initializing item database...");

     mUnknown.setName("Unknown item");

 

@@ -150,6 +154,8 @@ void ItemDB::load()
     }

 

     xmlFreeDoc(doc);

+

+    mLoaded = true;

 }

 

 void ItemDB::unload()

@@ -159,6 +165,8 @@ void ItemDB::unload()
         delete i->second;

     }

     mItemInfos.clear();

+

+    mLoaded = false;

 }

 

 const ItemInfo&