[Orxonox-commit 3517] r8203 - code/branches/masterserver2/src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2011-04-07 16:31:37 +0200 (Thu, 07 Apr 2011)
New Revision: 8203

Modified:
   code/branches/masterserver2/src/libraries/network/MasterServer.cc
   code/branches/masterserver2/src/libraries/network/ServerList.cc
Log:
yay, works

Modified: code/branches/masterserver2/src/libraries/network/MasterServer.cc
===================================================================
--- code/branches/masterserver2/src/libraries/network/MasterServer.cc	2011-04-07 14:18:08 UTC (rev 8202)
+++ code/branches/masterserver2/src/libraries/network/MasterServer.cc	2011-04-07 14:31:37 UTC (rev 8203)
@@ -107,16 +107,20 @@
   {
     /* get an iterator */
     std::list<ServerListElem>::iterator i;
+     
+    if( mainlist.serverlist.size() == 0 )
+      return;
 
     /* loop through list elements */
     for( i = mainlist.serverlist.begin(); i 
         != mainlist.serverlist.end(); ++i ) 
     {
-      if( mainlist.serverlist.size() != 0 && (*i).peer && 
+      if( (*i).peer && 
          ((*i).peer->state == ENET_PEER_STATE_DISCONNECTED ||
           (*i).peer->state == ENET_PEER_STATE_ZOMBIE ))
       { mainlist.delServerByName( (*i).ServerInfo.getServerName() );
         COUT(2) << "someone timed out.\n";
+        break;
       }
     }
  

Modified: code/branches/masterserver2/src/libraries/network/ServerList.cc
===================================================================
--- code/branches/masterserver2/src/libraries/network/ServerList.cc	2011-04-07 14:18:08 UTC (rev 8202)
+++ code/branches/masterserver2/src/libraries/network/ServerList.cc	2011-04-07 14:31:37 UTC (rev 8203)
@@ -60,7 +60,7 @@
     for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
       if( (*i).ServerInfo.getServerName() == name )
       { /* found this name, remove and quit */
-        this->serverlist.erase( i );
+        this->serverlist.clear();
         return true;
       }
     return false;