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

.github/workflows/github.yml

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

client/CServerHandler.cpp

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