From 8f7d929140f5d4ee5a5c86d111740c265fd4135b Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Thu, 4 Feb 2016 10:06:07 +0200 Subject: Fix unexpected world creation introduced by #2821 --- src/Root.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Root.cpp b/src/Root.cpp index aa532f88c..737d350ff 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -358,7 +358,7 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn // Fix servers that have default world configs created prior to #2815. See #2810. // This can probably be removed several years after 2016 // We start by inspecting the world linkage and determining if it's the default one - if (DefaultWorldName == "world") + if ((DefaultWorldName == "world") && (Worlds.size() == 1)) { auto DefaultWorldIniFile= cpp14::make_unique(); if (DefaultWorldIniFile->ReadFile("world/world.ini")) -- cgit v1.2.3