Revert "Attempt to fix infinite loading screen if server restarts during MP login"
This reverts commit8a00056a22
. This fix did not work, and there's a proper one on the 1.14 branch that needs to be forward-ported (a3243bb535
).
This commit is contained in:
parent
4157251f11
commit
f8b936c2d5
3 changed files with 1 additions and 10 deletions
|
@ -104,10 +104,6 @@ std::pair<wesnothd_connection_ptr, config> open_connection(std::string host)
|
|||
return std::make_pair(std::move(sock), config());
|
||||
}
|
||||
|
||||
if(!sock->socket_open()) {
|
||||
throw wesnothd_error("The server has shut down or restarted.");
|
||||
}
|
||||
|
||||
data.clear();
|
||||
sock->wait_and_receive_data(data);
|
||||
|
||||
|
|
|
@ -186,7 +186,7 @@ void wesnothd_connection::send_data(const configr_of& request)
|
|||
void wesnothd_connection::cancel()
|
||||
{
|
||||
MPTEST_LOG;
|
||||
if(socket_open()) {
|
||||
if(socket_.is_open()) {
|
||||
boost::system::error_code ec;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
|
|
@ -92,11 +92,6 @@ public:
|
|||
// Destroys this object.
|
||||
void stop();
|
||||
|
||||
bool socket_open() const
|
||||
{
|
||||
return socket_.is_open();
|
||||
}
|
||||
|
||||
/** True if connected and no high-level operation is in progress */
|
||||
bool handshake_finished() const
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue