diff options
| author | Jörg Müller <nexyon@gmail.com> | 2016-10-22 16:00:32 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2016-10-22 16:00:32 +0300 |
| commit | b5d527ff6c7e01b73c14d8e01b7e33a697d30b12 (patch) | |
| tree | 7c2ab385ed528492ff4f28c410d5a8a7712dcf59 /source/blender/editors/screen | |
| parent | 132478d4b8bb5dc1554f7ca01ac337fe1978e5fc (diff) | |
Fix T49656: Crash when starting playback while using JACK audio with A/V sync
When ED_screen_animation_play is called from wm_event_do_handlers,ScrArea *sa = CTX_wm_area(C); is NULL in ED_screen_animation_timer.
Informing the audio system in CTX_data_main_set, that a new Main has been set.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 677a6472c72..5cd0d33c365 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -2076,7 +2076,13 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, sad->flag |= (sync == 0) ? ANIMPLAY_FLAG_NO_SYNC : (sync == 1) ? ANIMPLAY_FLAG_SYNC : 0; ScrArea *sa = CTX_wm_area(C); - sad->from_anim_edit = (ELEM(sa->spacetype, SPACE_IPO, SPACE_ACTION, SPACE_NLA, SPACE_TIME)); + + char spacetype = -1; + + if (sa) + spacetype = sa->spacetype; + + sad->from_anim_edit = (ELEM(spacetype, SPACE_IPO, SPACE_ACTION, SPACE_NLA, SPACE_TIME)); screen->animtimer->customdata = sad; |