Always create new client and discard the existing connection when ent…

…ering the MenuState.
kevinortegren · Feb 18, 2014 · 1b3f2e4 · 1b3f2e4
1 parent e252234
commit 1b3f2e4
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/RootForce/Source/Menustate.cpp b/RootForce/Source/Menustate.cpp
@@ -46,15 +46,10 @@ namespace RootForce
 		m_menu->LoadDefaults(g_engineContext.m_configManager, m_workingDir);
 
 		// Destroy any existing server/client and setup a new network client so we can search for LAN-servers
-		if(!m_networkContext.m_client)
-		{
-			m_networkContext.m_client = std::shared_ptr<RootForce::Network::Client>(new RootForce::Network::Client(g_engineContext.m_logger, g_world));
-		}
-		if(!m_networkContext.m_clientMessageHandler)
-		{
-			m_networkContext.m_clientMessageHandler = std::shared_ptr<RootForce::Network::ClientMessageHandler>(new RootForce::Network::ClientMessageHandler(m_networkContext.m_client->GetPeerInterface(), g_world));
-			m_networkContext.m_client->SetMessageHandler(m_networkContext.m_clientMessageHandler.get());
-		}
+		m_networkContext.m_client = std::shared_ptr<RootForce::Network::Client>(new RootForce::Network::Client(g_engineContext.m_logger, g_world));
+		m_networkContext.m_clientMessageHandler = std::shared_ptr<RootForce::Network::ClientMessageHandler>(new RootForce::Network::ClientMessageHandler(m_networkContext.m_client->GetPeerInterface(), g_world));
+		m_networkContext.m_client->SetMessageHandler(m_networkContext.m_clientMessageHandler.get());
+
 		m_networkContext.m_server = nullptr;
 		m_networkContext.m_serverMessageHandler = nullptr;