[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/LoadThread.cpp
From: |
Tomas Groth |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/LoadThread.cpp |
Date: |
Wed, 30 May 2007 07:28:10 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/05/30 07:28:09
Modified files:
. : ChangeLog
libbase : LoadThread.cpp
Log message:
* libbase/LoadThread.cpp: Close the download thread even if
download wasen't completed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3399&r2=1.3400
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.12&r2=1.13
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3399
retrieving revision 1.3400
diff -u -b -r1.3399 -r1.3400
--- ChangeLog 29 May 2007 23:41:26 -0000 1.3399
+++ ChangeLog 30 May 2007 07:28:08 -0000 1.3400
@@ -1,3 +1,8 @@
+2007-05-30 Tomas Groth Christensen <address@hidden>
+
+ * libbase/LoadThread.cpp: Close the download thread even if
+ download wasen't completed.
+
2007-05-29 Tomas Groth Christensen <address@hidden>
* libbase/LoadThread.cpp: Don't lock the mutex and try to join the
Index: libbase/LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/LoadThread.cpp 29 May 2007 23:41:26 -0000 1.12
+++ libbase/LoadThread.cpp 30 May 2007 07:28:09 -0000 1.13
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: LoadThread.cpp,v 1.12 2007/05/29 23:41:26 tgc Exp $
+// $Id: LoadThread.cpp,v 1.13 2007/05/30 07:28:09 tgc Exp $
#include "LoadThread.h"
@@ -47,8 +47,9 @@
{
// stop the download thread if it's still runnning
#ifdef THREADED_LOADS
+ _completed = true;
boost::mutex::scoped_lock lock(_mutex);
- if ( _completed && _thread.get() )
+ if ( _thread.get() )
{
_thread->join();
_thread.reset(NULL);