GUACAMOLE-484: Always clean up after orderly disconnect.

This commit is contained in:
Michael Jumper 2018-01-22 12:23:39 -08:00
parent d562cb7648
commit 61c16a89d2

View File

@ -833,13 +833,11 @@ static int guac_rdp_handle_connection(guac_client* client) {
pthread_mutex_unlock(&(rdp_client->rdp_lock)); pthread_mutex_unlock(&(rdp_client->rdp_lock));
/* Close connection cleanly if server is disconnecting */ /* Close connection cleanly if server is disconnecting */
if (connection_closing) { if (connection_closing)
guac_rdp_client_abort(client); guac_rdp_client_abort(client);
return 1;
}
/* If an error occurred, fail */ /* If a low-level connection error occurred, fail */
if (wait_result < 0) else if (wait_result < 0)
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE, guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_UNAVAILABLE,
"Connection closed."); "Connection closed.");