0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handled case where wait_for_handshake is called more than once

Browse source
This commit is contained in:
Charles Dang 2019-08-06 11:22:02 +11:00
parent bcc119487a
commit 1d5e4f881a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wesnothd_connection.cpp
View file

@ -80,7 +80,7 @@ wesnothd_connection::wesnothd_connection(const std::string& host, const std::str
worker_thread_ = std::thread([this]() {
try {
io_service_.run();
} catch(const boost::system::system_error& err) {
} catch(const boost::system::system_error&) {
try {
// Attempt to pass the exception on to the handshake promise.
handshake_finished_.set_exception(std::current_exception());
@ -185,6 +185,10 @@ void wesnothd_connection::wait_for_handshake()
WRN_NW << __func__ << " Rethrowing: " << err.code() << "\n";
throw error(err.code());
} catch(const std::future_error& e) {
if(e.code() == std::future_errc::future_already_retrieved) {
return;
}
}
}