[Wesnoth-cvs-commits] wesnoth/src network_worker.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/06/14 22:56:35

Modified files:
        src            : network_worker.cpp 

Log message:
        attempt to fix assertion failure in network_worker.cpp

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.29 wesnoth/src/network_worker.cpp:1.30
--- wesnoth/src/network_worker.cpp:1.29 Sat Jun  4 19:16:05 2005
+++ wesnoth/src/network_worker.cpp      Tue Jun 14 22:56:35 2005
@@ -345,10 +345,11 @@
                for(socket_state_map::iterator i = sockets_locked.begin(); i != 
sockets_locked.end(); ++i) {
                        if(i->second == SOCKET_ERROR) {
                                --socket_errors;
-                               const TCPsocket res = i->first;
+                               const TCPsocket sock = i->first;
                                sockets_locked.erase(i);
-                               remove_buffers(res);
-                               return res;
+                               remove_buffers(sock);
+                               
pending_receives.erase(std::remove(pending_receives.begin(),pending_receives.end(),sock),pending_receives.end());
+                               return sock;
                        }
                }
        }