gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7280: Save in the right location on desync and server timeout

Browse Source
This commit is contained in:
Niels Martin Hansen 2019-02-28 19:36:27 +01:00
parent c91e0058c2
commit c61acc7fc1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network_client.cpp
View File

@ -125,6 +125,7 @@ struct PacketReader : LoadFilter {
void ClientNetworkEmergencySave() void ClientNetworkEmergencySave()
{ {
if (!_settings_client.gui.autosave_on_network_disconnect) return; if (!_settings_client.gui.autosave_on_network_disconnect) return;
if (!_networking) return;
const char *filename = "netsave.sav"; const char *filename = "netsave.sav";
DEBUG(net, 0, "Client: Performing emergency save (%s)", filename); DEBUG(net, 0, "Client: Performing emergency save (%s)", filename);
@ -212,6 +213,8 @@ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res)
SendError(errorno); SendError(errorno);
} }
ClientNetworkEmergencySave();
_switch_mode = SM_MENU; _switch_mode = SM_MENU;
this->CloseConnection(res); this->CloseConnection(res);
_networking = false; _networking = false;
@ -1173,7 +1176,6 @@ void ClientNetworkGameSocketHandler::CheckConnection()
if (lag > 20) { if (lag > 20) {
this->NetworkGameSocketHandler::CloseConnection(); this->NetworkGameSocketHandler::CloseConnection();
ShowErrorMessage(STR_NETWORK_ERROR_LOSTCONNECTION, INVALID_STRING_ID, WL_CRITICAL); ShowErrorMessage(STR_NETWORK_ERROR_LOSTCONNECTION, INVALID_STRING_ID, WL_CRITICAL);
ClientNetworkEmergencySave();
return; return;
} }