games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into lobby

Browse Source
This commit is contained in:
nordsoft
2022-11-02 18:33:33 +04:00
parent 1c84cc4521 418aabcd94
commit e21c2a02ce
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/github.yml vendored
View File

@@ -127,6 +127,10 @@ jobs:
MXE_TARGET: ${{ matrix.mxe }}
VCMI_BUILD_PLATFORM: x64
- uses: actions/setup-python@v4
if: "${{ matrix.conan_profile != '' }}"
with:
python-version: '3.10'
- name: Conan setup
if: "${{ matrix.conan_profile != '' }}"
run: |

14
client/CServerHandler.cpp
View File

@@ -281,10 +281,16 @@ void CServerHandler::justConnectToServer(const std::string & addr, const ui16 po
c->handler = std::make_shared<boost::thread>(&CServerHandler::threadHandleConnection, this);
if(addr.empty() || addr == localhostAddress)
return;
Settings serverAddress = settings.write["server"]["server"];
serverAddress->String() = addr;
if(!addr.empty() && addr != localhostAddress)
{
Settings serverAddress = settings.write["server"]["server"];
serverAddress->String() = addr;
}
if(port && port != getDefaultPort())
{
Settings serverPort = settings.write["server"]["port"];
serverPort->Integer() = port;
}
}
void CServerHandler::applyPacksOnLobbyScreen()