games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

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

Browse Source 
This reverts commit f42d4dc758.
This commit is contained in:
Ivan Savenko
2025-02-25 13:53:11 +00:00
parent bc90f4f4aa
commit a6a929eb95
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/CVCMIServer.cpp
View File

@@ -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
server/GlobalLobbyProcessor.cpp
View File

@@ -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)