mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2372 from zsilencer/bugfixes

Browse Source 
Fix #2352
This commit is contained in:
Ted John
2015-11-23 21:24:46 +00:00
parent 84e831b256 0c3c9d5400
commit c89561a81a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/network.cpp
View File

@@ -731,7 +731,11 @@ void Network::UpdateClient()
errormsg += ": ";
errormsg += server_connection.last_disconnect_reason;
}
window_network_status_open(errormsg.c_str());
if (server_connection.authstatus == NETWORK_AUTH_REQUIREPASSWORD) { // Do not show disconnect message window when password window closed/canceled
window_network_status_close();
} else {
window_network_status_open(errormsg.c_str());
}
Close();
}
ProcessGameCommandQueue();
@@ -1120,7 +1124,6 @@ bool Network::ProcessConnection(NetworkConnection& connection)
switch(packetStatus) {
case NETWORK_READPACKET_DISCONNECTED:
// closed connection or network error
PrintError();
if (!connection.last_disconnect_reason) {
connection.last_disconnect_reason = "Connection Closed";
}