diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-21 18:50:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-21 18:54:17 +0300 |
| commit | d086c01645e4f089a0dfb03b0267a7107affc490 (patch) | |
| tree | 3d8ceb3843a182161668adb7083976d32b2ff384 /source/blender/blenkernel/intern/sound.c | |
| parent | c16a5e772b2e120ff59964c11ab4424488947234 (diff) | |
Fix T59691: Crash when deleting data-block video or audio in a video editor
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 1f1ad4c4f21..829f0e0ab89 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -532,6 +532,10 @@ void *BKE_sound_scene_add_scene_sound_defaults(struct Scene *scene, struct Seque void *BKE_sound_add_scene_sound(struct Scene *scene, struct Sequence *sequence, int startframe, int endframe, int frameskip) { + /* Happens when sequence's sound datablock was removed. */ + if (sequence->sound == NULL) { + return NULL; + } const double fps = FPS; void *handle = AUD_Sequence_add(scene->sound_scene, sequence->sound->playback_handle, startframe / fps, endframe / fps, frameskip / fps); |