Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-03-12 16:07:25 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-03-12 16:07:25 +0300
commit4dbf499be3d076cceb5332cacf9407851e41654b (patch)
treeb8b20669b5d9838a50cbc718323bfa418d8812ed /source/blender/blenlib
parent353a078d4c1fc12eb4c444f6d7a020652c23dd71 (diff)
Fix crash in compositing nodes, due to threading problem.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/intern/threads.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 5f5a0720940..02d6ab0b7b5 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -229,8 +229,8 @@ void BLI_remove_thread(ListBase *threadbase, void *callerdata)
for(tslot= threadbase->first; tslot; tslot= tslot->next) {
if(tslot->callerdata==callerdata) {
- tslot->callerdata= NULL;
pthread_join(tslot->pthread, NULL);
+ tslot->callerdata= NULL;
tslot->avail= 1;
}
}
@@ -243,8 +243,8 @@ void BLI_remove_thread_index(ListBase *threadbase, int index)
for(tslot = threadbase->first; tslot; tslot = tslot->next, counter++) {
if (counter == index && tslot->avail == 0) {
- tslot->callerdata = NULL;
pthread_join(tslot->pthread, NULL);
+ tslot->callerdata = NULL;
tslot->avail = 1;
break;
}
@@ -257,8 +257,8 @@ void BLI_remove_threads(ListBase *threadbase)
for(tslot = threadbase->first; tslot; tslot = tslot->next) {
if (tslot->avail == 0) {
- tslot->callerdata = NULL;
pthread_join(tslot->pthread, NULL);
+ tslot->callerdata = NULL;
tslot->avail = 1;
}
}