diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-09 18:28:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-09 18:28:29 +0400 |
| commit | 5f52285a0159c1e2d98959c193f293049cfd9440 (patch) | |
| tree | e51af8861a80e8f850d6322407ecaa9df365901c /intern/cycles/util/util_thread.h | |
| parent | 97d4fb4161bc82888fc1052e53882ccaae6be1f4 (diff) | |
Fix cycles task manager calling pthread_join() twice. I haven't seen any bugs
from this but best to fix anyway as it causes undefined behavior. Pointed out
on irc by dslammu, thanks!
Diffstat (limited to 'intern/cycles/util/util_thread.h')
| -rw-r--r-- | intern/cycles/util/util_thread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/util/util_thread.h b/intern/cycles/util/util_thread.h index 9bea4e7808a..843764ca9d6 100644 --- a/intern/cycles/util/util_thread.h +++ b/intern/cycles/util/util_thread.h @@ -60,6 +60,7 @@ public: bool join() { + joined = true; return pthread_join(pthread_id, NULL) == 0; } |