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

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/19 15:31:51

Modified files:
        src            : network_worker.cpp 

Log message:
        remove bytes_to_send == res check. It seems to cause trouble with mini 
campaign game creation.

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

Patches:
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.43 wesnoth/src/network_worker.cpp:1.44
--- wesnoth/src/network_worker.cpp:1.43 Thu Aug 18 17:39:36 2005
+++ wesnoth/src/network_worker.cpp      Fri Aug 19 15:31:50 2005
@@ -1,4 +1,4 @@
-/* $Id: network_worker.cpp,v 1.43 2005/08/18 17:39:36 j_daniel Exp $ */
+/* $Id: network_worker.cpp,v 1.44 2005/08/19 15:31:50 j_daniel Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -80,8 +80,7 @@
                        if(sockets_locked[sock] != SOCKET_LOCKED)
                                return SOCKET_ERROR;
                }
-               const int bytes_to_send = static_cast<int>(size - upto);
-               const int res = SDLNet_TCP_Send(sock, &buf[upto], 
bytes_to_send);
+               const int res = SDLNet_TCP_Send(sock, &buf[upto], 
static_cast<int>(size - upto));
 
                if(res == -1) {
 #ifdef EAGAIN
@@ -97,9 +96,6 @@
                                continue;
                        }
 #endif
-                       return SOCKET_ERROR;
-               }
-               if(res != bytes_to_send) {
                        return SOCKET_ERROR;
                }
                timeout = 15000;