dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15989) -Fix (r15987: segfault due to uninitialised sockets.

Browse Source
This commit is contained in:
rubidium
2009-04-08 21:03:00 +00:00
parent 1d4318c0d1
commit e779c56e31
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network.cpp
View File

@@ -587,7 +587,6 @@ static void NetworkClose()
_listensockets.Clear(); _listensockets.Clear();
DEBUG(net, 1, "Closed listener"); DEBUG(net, 1, "Closed listener");
} }
NetworkUDPClose();
TCPConnecter::KillAll(); TCPConnecter::KillAll();
@@ -1088,6 +1087,7 @@ void NetworkStartUp()
void NetworkShutDown() void NetworkShutDown()
{ {
NetworkDisconnect(); NetworkDisconnect();
NetworkUDPClose();
DEBUG(net, 3, "[core] shutting down network"); DEBUG(net, 3, "[core] shutting down network");

3
src/network/network_udp.cpp
View File

@@ -520,6 +520,9 @@ void NetworkUDPAdvertise()
void NetworkUDPInitialize() void NetworkUDPInitialize()
{ {
/* If not closed, then do it. */
if (_udp_server_socket != NULL) NetworkUDPClose();
DEBUG(net, 1, "[udp] initializing listeners"); DEBUG(net, 1, "[udp] initializing listeners");
assert(_udp_client_socket == NULL && _udp_server_socket == NULL && _udp_master_socket == NULL); assert(_udp_client_socket == NULL && _udp_server_socket == NULL && _udp_master_socket == NULL);