From 50ef801a79b5c280ecd02f89e9a9b4533e4102c4 Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Wed, 13 May 2020 00:10:58 +0200 Subject: Fix T76320: Thread race condition on undo with prefetching enabled Stop prefetch jobs before undoing. Reviewed By: brecht Differential Revision: https://developer.blender.org/D7633 --- source/blender/windowmanager/intern/wm_jobs.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/windowmanager/intern/wm_jobs.c') diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 245a8f28fec..c10f03f3dab 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -35,6 +35,7 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_sequencer.h" #include "WM_api.h" #include "WM_types.h" @@ -558,6 +559,9 @@ void WM_jobs_kill_all(wmWindowManager *wm) while ((wm_job = wm->jobs.first)) { wm_jobs_kill_job(wm, wm_job); } + + /* This job will be automatically restarted */ + BKE_sequencer_prefetch_stop_all(); } /* wait until every job ended, except for one owner (used in undo to keep screen job alive) */ -- cgit v1.2.3