From ba3f439bcb7523776c8c064333d1c3aada46d59c Mon Sep 17 00:00:00 2001 From: Naios Date: Thu, 3 Mar 2016 01:27:02 +0100 Subject: Core/Database: Close the databases correctly when the DBUpdater fails * Also fixes a memory leak spotted by Aokromes (cherry picked from commit 7d3cffc297b6a1e24faf64a19b5167609ad8abbf) --- src/server/worldserver/Main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/worldserver/Main.cpp') 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; -- cgit v1.2.3