diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-06-24 19:02:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-06-24 19:02:30 +0300 |
| commit | f51438aea0ec2f15b5a2285216d21d821bbaad79 (patch) | |
| tree | 51e7aa7bc93592a93937a0524bcf5851a5791aae /source/blender/editors | |
| parent | c2d285f0ffc03a02ad6c48e30bb90063da19a976 (diff) | |
Fix T51792: crash calling bpy.ops.screen.animation_cancel while scrubbing.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 9dbc082c119..c99d9add432 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3756,7 +3756,7 @@ static int screen_animation_cancel_exec(bContext *C, wmOperator *op) bScreen *screen = ED_screen_animation_playing(CTX_wm_manager(C)); if (screen) { - if (RNA_boolean_get(op->ptr, "restore_frame")) { + if (RNA_boolean_get(op->ptr, "restore_frame") && screen->animtimer) { ScreenAnimData *sad = screen->animtimer->customdata; Scene *scene = CTX_data_scene(C); |