From a7862a200fcb06ee9bea6c961ac611c7079f6384 Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Mon, 28 Apr 2014 19:36:08 +0200
Subject: [PATCH] Fix: Map changing with dummy

---
 src/engine/client/client.cpp | 11 +++++++++++
 src/engine/client/client.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 62097dfc5..0c4b527f7 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -657,6 +657,7 @@ void CClient::DummyConnect()
 
 	//connecting to the server
 	m_DummyConnected = 1;
+	m_DummyConnecting = 1;
 	m_NetClient[1].Connect(&m_ServerAddress);
 
 	// send client info
@@ -1295,6 +1296,16 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket)
 			if(Unpacker.Error())
 				return;
 
+			if(m_DummyConnecting)
+			{
+				m_DummyConnecting = 0;
+			}
+			else
+			{
+				m_DummyConnected = 0;
+				g_Config.m_ClDummy = 0;
+			}
+
 			// check for valid standard map
 			if(!m_MapChecker.IsMapValid(pMap, MapCrc, MapSize))
 				pError = "invalid standard map";
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index 42b5962d7..111f8243f 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -245,6 +245,7 @@ public:
 	virtual bool DummyConnected();
 	void DummyInfo();
 	int m_DummyConnected;
+	int m_DummyConnecting;
 	int m_LastDummyConnectTime;
 
 	virtual void GetServerInfo(CServerInfo *pServerInfo);