Mercurial Mercurial > openttd-ottdgrfs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r4608) -Backported r4413 from trunk: 0.4
authorcelestar
Fri, 28 Apr 2006 07:53:10 +0000
branch0.4
changeset 9972 667166ed9a4c
parent 9971 1ee3bab0fd2a
child 9973 72d7f7f30746
(svn r4608) -Backported r4413 from trunk:
-Fix: fixed a bug which pushed the client back to the main menu when a
server is in the mainserver-list which sends out illegal signals. Many
tnx to 'test' for finding and isolating the problem.
-Fix: also specify the problem a bit better
network_data.c file | annotate | diff | comparison | revisions
network_udp.c file | annotate | diff | comparison | revisions 
--- a/network_data.c	Fri Apr 28 07:51:32 2006 +0000
+++ b/network_data.c	Fri Apr 28 07:53:10 2006 +0000
@@ -125,7 +125,7 @@
 	NetworkCloseClient(cs);
 
 	// Clients drop back to the main menu
-	if (!_network_server) {
+	if (!_network_server && _networking) {
 		_switch_mode = SM_MENU;
 		_networking = false;
 		_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION;
--- a/network_udp.c	Fri Apr 28 07:51:32 2006 +0000
+++ b/network_udp.c	Fri Apr 28 07:53:10 2006 +0000
@@ -331,8 +331,12 @@
 
 	if (type < PACKET_UDP_END && _network_udp_packet[type] != NULL && !_udp_cs.quited) {
 		_network_udp_packet[type](p, client_addr);
-	}	else {
-		DEBUG(net, 0)("[NET][UDP] Received invalid packet type %d", type);
+	} else {
+		if (!_udp_cs.quited) {
+			DEBUG(net, 0)("[NET][UDP] Received invalid packet type %d", type);
+		} else {
+			DEBUG(net, 0)("[NET][UDP] Received illegal packet");
+		}
 	}
 }
openttd-ottdgrfs