[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src network.cpp
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src network.cpp |
Date: |
Mon, 08 Aug 2005 18:47:49 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/08/08 22:47:49
Modified files:
src : network.cpp
Log message:
Fix did not work so revert it
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network.cpp.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
Patches:
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.72 wesnoth/src/network.cpp:1.73
--- wesnoth/src/network.cpp:1.72 Mon Aug 8 21:58:01 2005
+++ wesnoth/src/network.cpp Mon Aug 8 22:47:49 2005
@@ -1,4 +1,4 @@
-/* $Id: network.cpp,v 1.72 2005/08/08 21:58:01 j_daniel Exp $ */
+/* $Id: network.cpp,v 1.73 2005/08/08 22:47:49 j_daniel Exp $ */
/*
Copyright (C) 2003-5 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -309,6 +309,7 @@
LOG_NW << "sent handshake...\n";
+ const threading::lock l(get_mutex());
if(is_aborted()) {
LOG_NW << "connect operation aborted by calling thread\n";
SDLNet_TCP_Close(sock);
@@ -331,7 +332,6 @@
wassert(schemas.count(connect_) == 0);
schemas.insert(std::pair<network::connection,schema_pair>(connect_,schema_pair()));
- const threading::lock l(get_mutex());
while(!notify_finished());
}
- [Wesnoth-cvs-commits] wesnoth/src network.cpp, Jon Daniel, 2005/08/08
- [Wesnoth-cvs-commits] wesnoth/src network.cpp,
Jon Daniel <=
- [Wesnoth-cvs-commits] wesnoth/src network.cpp, Jon Daniel, 2005/08/09
- [Wesnoth-cvs-commits] wesnoth/src network.cpp, Jon Daniel, 2005/08/17
- [Wesnoth-cvs-commits] wesnoth/src network.cpp, Jon Daniel, 2005/08/17
- [Wesnoth-cvs-commits] wesnoth/src network.cpp, Jon Daniel, 2005/08/17
- [Wesnoth-cvs-commits] wesnoth/src network.cpp, Jon Daniel, 2005/08/20