diff options
Diffstat (limited to 'intern/cycles/util/util_progress.h')
-rw-r--r-- | intern/cycles/util/util_progress.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h index 2cc2995bcfe..c63aa841c52 100644 --- a/intern/cycles/util/util_progress.h +++ b/intern/cycles/util/util_progress.h @@ -153,8 +153,10 @@ public: void set_update() { - if(update_cb) + if(update_cb) { + thread_scoped_lock lock(update_mutex); update_cb(); + } } void set_update_callback(boost::function<void(void)> function) @@ -164,6 +166,7 @@ public: protected: thread_mutex progress_mutex; + thread_mutex update_mutex; boost::function<void(void)> update_cb; boost::function<void(void)> cancel_cb; |