diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-26 21:48:07 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-26 21:48:07 +0400 |
commit | 73a6ae710679ad5f2186e61d57d916442d23a43a (patch) | |
tree | e18b5423f7488029945322bfda2f50be7f390335 | |
parent | 7e5c02672ae9c368260632f3717d56b4927a99f7 (diff) |
Fix crash clicking Render button in render layer compositing node. Actually
this crash could happen in other situations too, problem was a bug in the
jobs system. A job could be suspended, and the operator would stop before
the job was actually done since it was not marked as running.
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 774aec51216..877b8a92296 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -173,10 +173,12 @@ int WM_jobs_test(wmWindowManager *wm, void *owner) { wmJob *steve; + /* job can be running or about to run (suspended) */ for (steve = wm->jobs.first; steve; steve = steve->next) if (steve->owner == owner) - if (steve->running) + if (steve->running || steve->suspended) return 1; + return 0; } |