mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2865 from octaroot/net_game_segfault_missing_object 

Fix segfault when loading network game with unknown objects
This commit is contained in:
Ted John 2016-02-02 13:36:13 +00:00
parent 7e21ef7ca4 5d69eda3da
commit 67c807f81f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network.cpp
View File

@ -1716,6 +1716,12 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa
// window_network_status_open("Loaded new map from network");
_desynchronised = false;
}
else
{
//Something went wrong, game is not loaded. Return to main screen.
game_do_command(0, GAME_COMMAND_FLAG_APPLY, 0, 0, GAME_COMMAND_LOAD_OR_QUIT, 1, 0);
}
SDL_RWclose(rw);
if (has_to_free)
{