From 7d3cffc297b6a1e24faf64a19b5167609ad8abbf Mon Sep 17 00:00:00 2001
From: Naios <naios-dev@live.de>
Date: Wed, 2 Mar 2016 00:47:49 +0100
Subject: Core/Database: Close the databases correctly when the DBUpdater fails
 * Also fixes a memory leak spotted by Aokromes

---
 src/server/worldserver/Main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server/worldserver/Main.cpp')

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;
-- 
cgit v1.2.3