mirror of https://github.com/OpenRCT2/OpenRCT2.git
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:
commit
67c807f81f
|
@ -1716,6 +1716,12 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa
|
||||||
// window_network_status_open("Loaded new map from network");
|
// window_network_status_open("Loaded new map from network");
|
||||||
_desynchronised = false;
|
_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);
|
SDL_RWclose(rw);
|
||||||
if (has_to_free)
|
if (has_to_free)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue