games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

CServerHandler::justConnectToServer(): Read settings only once

Browse Source
This commit is contained in:
Alexander Wilms
2023-09-27 15:55:15 +02:00
parent 614d000376
commit 9f9930a9dd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/CServerHandler.cpp
View File

@@ -251,14 +251,16 @@ void CServerHandler::startLocalServerAndConnect()
void CServerHandler::justConnectToServer(const std::string & addr, const ui16 port) void CServerHandler::justConnectToServer(const std::string & addr, const ui16 port)
{ {
state = EClientState::CONNECTING; state = EClientState::CONNECTING;
std::string hostAddress = getHostAddress();
ui16 hostPort = getHostPort();
logNetwork->info("Establishing connection...");
while(!c && state != EClientState::CONNECTION_CANCELLED) while(!c && state != EClientState::CONNECTION_CANCELLED)
{ {
try try
{ {
logNetwork->info("Establishing connection...");
c = std::make_shared<CConnection>( c = std::make_shared<CConnection>(
addr.size() ? addr : getHostAddress(), addr.size() ? addr : hostAddress,
port ? port : getHostPort(), port ? port : hostPort,
NAME, uuid); NAME, uuid);
} }
catch(std::runtime_error & error) catch(std::runtime_error & error)