[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp network.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/05 23:01:13

Modified files:
        src            : multiplayer.cpp network.cpp 

Log message:
        Fix statistics functions for 0 connection handle

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.163&tr2=1.164&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.69&tr2=1.70&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.163 wesnoth/src/multiplayer.cpp:1.164
--- wesnoth/src/multiplayer.cpp:1.163   Fri Aug  5 22:23:42 2005
+++ wesnoth/src/multiplayer.cpp Fri Aug  5 23:01:13 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.163 2005/08/05 22:23:42 j_daniel Exp $ */
+/* $Id: multiplayer.cpp,v 1.164 2005/08/05 23:01:13 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -130,7 +130,7 @@
 
                data.clear();
                network::connection data_res = gui::network_data_dialog(
-                               disp,_("Connecting to remote host..."),data, 
sock);
+                               disp,_("Connecting to remote host..."),data);
                mp::check_response(data_res, data);
 
                // Backwards-compatibility "version" attribute
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.69 wesnoth/src/network.cpp:1.70
--- wesnoth/src/network.cpp:1.69        Fri Aug  5 21:53:03 2005
+++ wesnoth/src/network.cpp     Fri Aug  5 23:01:13 2005
@@ -1,4 +1,4 @@
-/* $Id: network.cpp,v 1.69 2005/08/05 21:53:03 j_daniel Exp $ */
+/* $Id: network.cpp,v 1.70 2005/08/05 23:01:13 j_daniel Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -706,11 +706,11 @@
 
 statistics get_send_stats(connection handle)
 {
-       return 
network_worker_pool::get_current_transfer_stats(get_socket(handle)).first;
+       return network_worker_pool::get_current_transfer_stats(handle == 0 ? 
get_socket(sockets.back()) : get_socket(handle)).first;
 }
 statistics get_receive_stats(connection handle)
 {
-       return 
network_worker_pool::get_current_transfer_stats(get_socket(handle)).second;
+       return network_worker_pool::get_current_transfer_stats(handle == 0 ? 
get_socket(sockets.back()) : get_socket(handle)).second;
 }
 
 } //end namespace network