diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-01 16:43:49 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-01 16:43:49 +0400 |
commit | e21a7b32f9d54dcf1091ce02989921566c02f80f (patch) | |
tree | 9f0f90d4ba1d60ee3f5f2dbe16c4a951afcfa0a4 /source/blender | |
parent | fb25a86f43435e3eb60611cb8a5d3daefa09f21b (diff) |
Fix T39546: blender crash on open recent file, when tracking is still in progress
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index c59b6b8c8a1..1c2933b823d 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1307,10 +1307,13 @@ static void track_markers_updatejob(void *tmv) static void track_markers_endjob(void *tmv) { TrackMarkersJob *tmj = (TrackMarkersJob *)tmv; + wmWindowManager *wm = tmj->main->wm.first; tmj->clip->tracking_context = NULL; tmj->scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(tmj->clip, tmj->lastfra); - ED_update_for_newframe(tmj->main, tmj->scene, 0); + if (wm != NULL) { + ED_update_for_newframe(tmj->main, tmj->scene, 0); + } BKE_tracking_context_sync(tmj->context); BKE_tracking_context_finish(tmj->context); |