From 3da609588ad6fe7eb0581e4678a2ec8c6c1c4a18 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Thu, 31 Jul 2008 12:43:43 +0000
Subject: more heisenbugs fixes

---
 src/core/netserver.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/core/netserver.cc')

diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index 10fd554..dd5dc38 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -125,7 +125,7 @@ void NetServer::abort() {
 // remove disconnected clients
 void NetServer::reap()
 {
-        for (Clients:: iterator it = clients.begin(); it != clients.end(); it++) {
+        for (Clients:: iterator it = clients.begin(); it != clients.end(); ) {
                 NetClient *client = *it;
 
 		if (client->client_timeout + NETTIMEOUT < application()->time()) {
@@ -151,10 +151,12 @@ void NetServer::reap()
 				server()->player_disconnect((*it)->player());
 
 			// remove the client
-                        clients.erase(it);
                         delete client;
-                        it=clients.begin();
-                }
+			clients.erase(it++);
+
+                } else {
+			++it;
+		}
         }
 }
 
-- 
cgit v1.2.3