diff options
| author | Naios <naios-dev@live.de> | 2016-03-03 01:27:02 +0100 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-03-03 01:27:02 +0100 |
| commit | ba3f439bcb7523776c8c064333d1c3aada46d59c (patch) | |
| tree | 282f75fa82251baa7e68ad911f69733275e44b40 /src/server/worldserver/Main.cpp | |
| parent | cf2fead644fe76b3d1b2814ebf1877c8d7ee516c (diff) | |
Core/Database: Close the databases correctly when the DBUpdater fails
* Also fixes a memory leak spotted by Aokromes
(cherry picked from commit 7d3cffc297b6a1e24faf64a19b5167609ad8abbf)
Diffstat (limited to 'src/server/worldserver/Main.cpp')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 2f556b3fa64..eed218ad7a4 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -522,10 +522,10 @@ bool StartDB() // Load databases DatabaseLoader loader("server.worldserver", DatabaseLoader::DATABASE_NONE); loader - .AddDatabase(HotfixDatabase, "Hotfix") - .AddDatabase(WorldDatabase, "World") + .AddDatabase(LoginDatabase, "Login") .AddDatabase(CharacterDatabase, "Character") - .AddDatabase(LoginDatabase, "Login"); + .AddDatabase(WorldDatabase, "World") + .AddDatabase(HotfixDatabase, "Hotfix"); if (!loader.Load()) return false; |