From a28b0dc1201dca7c34d9a6c33232157e45a6d4f8 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 22 Jul 2014 17:26:48 +0100
Subject: Speed improvements, crash fixes, & self-suggestions

---
 src/Root.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/Root.cpp')

diff --git a/src/Root.cpp b/src/Root.cpp
index b793cb154..b65e9b067 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -314,10 +314,12 @@ void cRoot::LoadWorlds(cIniFile & IniFile)
 
 cWorld * cRoot::CreateAndInitializeWorld(const AString & a_WorldName, eDimension a_Dimension, const AString & a_OverworldName)
 {
-	if (m_WorldsByName[a_WorldName] != NULL)
+	cWorld * World = m_WorldsByName[a_WorldName];
+	if (World != NULL)
 	{
-		return NULL;
+		return World;
 	}
+
 	cWorld * NewWorld = new cWorld(a_WorldName.c_str(), a_Dimension, a_OverworldName);
 	m_WorldsByName[a_WorldName] = NewWorld;
 	NewWorld->Start();
-- 
cgit v1.2.3