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

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <[EMAIL PROTECTED]>  05/08/08 21:58:01

Modified files:
        src            : network.cpp 

Log message:
        attempt to fix the OS X connect bug

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

Patches:
Index: wesnoth/src/network.cpp
diff -u wesnoth/src/network.cpp:1.71 wesnoth/src/network.cpp:1.72
--- wesnoth/src/network.cpp:1.71        Mon Aug  8 12:48:51 2005
+++ wesnoth/src/network.cpp     Mon Aug  8 21:58:01 2005
@@ -1,4 +1,4 @@
-/* $Id: network.cpp,v 1.71 2005/08/08 12:48:51 j_daniel Exp $ */
+/* $Id: network.cpp,v 1.72 2005/08/08 21:58:01 j_daniel Exp $ */
 /*
    Copyright (C) 2003-5 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -307,8 +307,6 @@
                return;
        }
 
-       //no blocking operations from here on
-       const threading::lock l(get_mutex());
        LOG_NW << "sent handshake...\n";
 
        if(is_aborted()) {
@@ -333,6 +331,7 @@
        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());
 }