aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-02 00:47:49 +0100
committerNaios <naios-dev@live.de>2016-03-03 01:06:13 +0100
commit7d3cffc297b6a1e24faf64a19b5167609ad8abbf (patch)
treeeed818a0dc881ee95eff2fdc3206e2de1f09d722 /src/server/worldserver/Main.cpp
parent472e78d682cb5d5abf4d60111f238744c07096ac (diff)
Core/Database: Close the databases correctly when the DBUpdater fails
* Also fixes a memory leak spotted by Aokromes
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r--src/server/worldserver/Main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 53c5f250851..58ddce532c0 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -449,9 +449,9 @@ bool StartDB()
// Load databases
DatabaseLoader loader("server.worldserver", DatabaseLoader::DATABASE_NONE);
loader
- .AddDatabase(WorldDatabase, "World")
+ .AddDatabase(LoginDatabase, "Login")
.AddDatabase(CharacterDatabase, "Character")
- .AddDatabase(LoginDatabase, "Login");
+ .AddDatabase(WorldDatabase, "World");
if (!loader.Load())
return false;