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

Skip closing network if already closed 

Fixes #2203
This commit is contained in:
Michał Janiszewski 2015-11-12 10:55:47 +01:00
parent 32b1171b2f
commit e7b58b7375
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/network.cpp
View File

@ -438,11 +438,18 @@ bool Network::Init()
wsa_initialized = true;
}
#endif
status = NETWORK_STATUS_READY;
return true;
}
void Network::Close()
{
if (status == NETWORK_STATUS_NONE)
{
// Already closed. This prevents a call in ~Network() to gfx_invalidate_screen()
// which may no longer be valid on Linux and would cause a segfault.
return;
}
if (mode == NETWORK_MODE_CLIENT) {
closesocket(server_connection.socket);
} else
@ -1398,7 +1405,7 @@ int Network::Server_Handle_GAMECMD(NetworkConnection& connection, NetworkPacket&
packet >> tick >> args[0] >> args[1] >> args[2] >> args[3] >> args[4] >> args[5] >> args[6] >> callback;
int commandCommand = args[4];
// Don't let clients send pause or quit
if (commandCommand != GAME_COMMAND_TOGGLE_PAUSE &&
commandCommand != GAME_COMMAND_LOAD_OR_QUIT
@ -1406,7 +1413,7 @@ int Network::Server_Handle_GAMECMD(NetworkConnection& connection, NetworkPacket&
Server_Send_GAMECMD(args[0], args[1], args[2], args[3], args[4], args[5], args[6], playerid, callback);
game_do_command(args[0], args[1], args[2], args[3], args[4], args[5], args[6]);
}
return 1;
}

1
src/network/network.h
View File

@ -44,6 +44,7 @@ enum {
enum {
NETWORK_STATUS_NONE,
NETWORK_STATUS_READY,
NETWORK_STATUS_RESOLVING,
NETWORK_STATUS_CONNECTING,
NETWORK_STATUS_CONNECTED