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/blenkernel/intern/context.c | |
| 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/blenkernel/intern/context.c')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 926ca8da192..4c01bfd35f2 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -49,6 +49,7 @@ #include "BKE_context.h" #include "BKE_main.h" #include "BKE_screen.h" +#include "BKE_sound.h" #include "RNA_access.h" @@ -882,6 +883,7 @@ Main *CTX_data_main(const bContext *C) void CTX_data_main_set(bContext *C, Main *bmain) { C->data.main = bmain; + BKE_sound_init_main(bmain); } Scene *CTX_data_scene(const bContext *C) |