Browse Source

Revert "Fix crash on attempting to connect newly created lobby room"

This reverts commit f42d4dc75836acca81e5572f6cbd3beadead778a.
Ivan Savenko 7 tháng trước cách đây
mục cha
commit
a6a929eb95
2 tập tin đã thay đổi với 13 bổ sung10 xóa
  1. 12 10
      server/CVCMIServer.cpp
  2. 1 0
      server/GlobalLobbyProcessor.cpp

+ 12 - 10
server/CVCMIServer.cpp

@@ -80,25 +80,27 @@ CVCMIServer::CVCMIServer(uint16_t port, bool runByClient)
 
 CVCMIServer::~CVCMIServer() = default;
 
-uint16_t CVCMIServer::prepare(bool connectToLobby, bool listenForConnections)
-{
-	if(connectToLobby)
+uint16_t CVCMIServer::prepare(bool connectToLobby, bool listenForConnections) {
+	if(connectToLobby) {
 		lobbyProcessor = std::make_unique<GlobalLobbyProcessor>(*this);
-
-	return startAcceptingIncomingConnections(listenForConnections);
+		return 0;
+	} else {
+		return startAcceptingIncomingConnections(listenForConnections);
+	}
 }
 
 uint16_t CVCMIServer::startAcceptingIncomingConnections(bool listenForConnections)
 {
 	networkServer = networkHandler->createServerTCP(*this);
 
+	port
+		? logNetwork->info("Port %d will be used", port)
+		: logNetwork->info("Randomly assigned port will be used");
+
+	// config port may be 0 => srvport will contain the OS-assigned port value
+
 	if (listenForConnections)
 	{
-		// config port may be 0 => srvport will contain the OS-assigned port value
-		port
-			? logNetwork->info("Port %d will be used", port)
-			: logNetwork->info("Randomly assigned port will be used");
-
 		auto srvport = networkServer->start(port);
 		logNetwork->info("Listening for connections at port %d", srvport);
 		return srvport;

+ 1 - 0
server/GlobalLobbyProcessor.cpp

@@ -99,6 +99,7 @@ void GlobalLobbyProcessor::receiveServerLoginSuccess(const JsonNode & json)
 {
 	// no-op, wait just for any new commands from lobby
 	logGlobal->info("Lobby: Successfully connected to lobby server");
+	owner.startAcceptingIncomingConnections(true);
 }
 
 void GlobalLobbyProcessor::receiveAccountJoinsRoom(const JsonNode & json)