Merge branch 'master' into jgrpp

# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp

src/network/network_client.cpp

@@ -249,11 +249,11 @@ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res)
 	}
 
 	this->SendPackets();
+	this->CloseConnection(res);
 
 	ClientNetworkEmergencySave();
 
 	_switch_mode = SM_MENU;
-	this->CloseConnection(res);
 	_networking = false;
 }