[Gnash-commit] gnash ChangeLog libbase/LoadThread.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/29 23:41:26

Modified files:
        .              : ChangeLog 
        libbase        : LoadThread.cpp 

Log message:
                * libbase/LoadThread.cpp: Don't lock the mutex and try to join 
the 
                  download thread when calling complete(), instead do that in 
the
                  destrutor. Fixes some blocking (with the 
no-decode-thread-patch
                  for NetStreamFfmpeg).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3398&r2=1.3399
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3398
retrieving revision 1.3399
diff -u -b -r1.3398 -r1.3399
--- ChangeLog   29 May 2007 22:48:24 -0000      1.3398
+++ ChangeLog   29 May 2007 23:41:26 -0000      1.3399
@@ -1,3 +1,10 @@
+2007-05-29 Tomas Groth Christensen <address@hidden>
+
+       * libbase/LoadThread.cpp: Don't lock the mutex and try to join the 
+         download thread when calling complete(), instead do that in the
+         destrutor. Fixes some blocking (with the no-decode-thread-patch
+         for NetStreamFfmpeg).
+
 2007-05-29 Sandro Santilli <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.{cpp,h}: don't lock

Index: libbase/LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/LoadThread.cpp      24 May 2007 22:27:09 -0000      1.11
+++ libbase/LoadThread.cpp      29 May 2007 23:41:26 -0000      1.12
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: LoadThread.cpp,v 1.11 2007/05/24 22:27:09 tgc Exp $
+// $Id: LoadThread.cpp,v 1.12 2007/05/29 23:41:26 tgc Exp $
 
 #include "LoadThread.h"
 
@@ -46,7 +46,14 @@
 LoadThread::~LoadThread()
 {
        // stop the download thread if it's still runnning
-       completed();
+#ifdef THREADED_LOADS
+       boost::mutex::scoped_lock lock(_mutex);
+       if (  _completed && _thread.get() )
+       {
+               _thread->join();
+               _thread.reset(NULL);
+       }
+#endif
        if (_cache) delete[] _cache;
 }
 
@@ -225,15 +232,6 @@
 
 bool LoadThread::completed()
 {
-#ifdef THREADED_LOADS
-       boost::mutex::scoped_lock lock(_mutex);
-       if (  _completed && _thread.get() )
-       {
-               _thread->join();
-               _thread.reset(NULL);
-       }
-#endif
-
        return _completed;
 }