Changeset 8203 for code/branches/masterserver2/src/libraries

Timestamp:

Apr 7, 2011, 4:31:37 PM (14 years ago)

Author:

smerkli

Message:

yay, works

Location:

code/branches/masterserver2/src/libraries/network

Files:

• MasterServer.cc (modified) (2 diffs)
• ServerList.cc (modified) (1 diff)

code/branches/masterserver2/src/libraries/network/MasterServer.cc

@@ -108 +108 @@
     /* get an iterator */
     std::list<ServerListElem>::iterator i;
+     
+    if( mainlist.serverlist.size() == 0 )
+      return;
 
     /* loop through list elements */
@@ -113 +116 @@
         != 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;
       }
     }

code/branches/masterserver2/src/libraries/network/ServerList.cc

@@ -61 +61 @@
       if( (*i).ServerInfo.getServerName() == name )
       { /* found this name, remove and quit */
-        this->serverlist.erase( i );
+        this->serverlist.clear();
         return true;
       }