summaryrefslogtreecommitdiff
path: root/src/network/network_content.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-07-13 09:26:11 +0000
committerrubidium <rubidium@openttd.org>2013-07-13 09:26:11 +0000
commit5eac3a77d20c3a838203bd261b05601fa0c7b6ee (patch)
treee28365da85a6103365d043717c56e2d1da088b37 /src/network/network_content.cpp
parent8f89cd6dd3dff7c36c6080de03b4ffc102f1b771 (diff)
downloadopenttd-5eac3a77d20c3a838203bd261b05601fa0c7b6ee.tar.xz
(svn r25597) -Fix [FS#5635]: [Content] When the server closed the connection, the client would for eternity try to read a packet and never timeout making it impossible to reconnect
Diffstat (limited to 'src/network/network_content.cpp')
-rw-r--r--src/network/network_content.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 07bf8ab9f..e6e91897c 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -778,8 +778,10 @@ void ClientNetworkContentSocketHandler::SendReceive()
}
if (this->CanSendReceive()) {
- this->ReceivePackets();
- this->lastActivity = _realtime_tick;
+ if (this->ReceivePackets()) {
+ /* Only update activity once a packet is received, instead of everytime we try it. */
+ this->lastActivity = _realtime_tick;
+ }
}
this->SendPackets();