griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix: Removing a sound from a speaker resulted in a crash.

Browse Source
This commit is contained in:
Joerg Mueller
2011-08-23 11:44:24 +00:00
parent f0d5abfcb2
commit ff8daca1f1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/sound.c
View File

@@ -676,11 +676,17 @@ void sound_update_scene(struct Main* bmain, struct Scene* scene)
if(AUD_removeSet(scene->speaker_handles, strip->speaker_handle))
{
AUD_moveSequence(strip->speaker_handle, strip->start / FPS, -1, 0);
if(speaker->sound)
AUD_moveSequence(strip->speaker_handle, strip->start / FPS, -1, 0);
else
{
AUD_removeSequence(scene->sound_scene, strip->speaker_handle);
strip->speaker_handle = NULL;
}
}
else
{
if(speaker && speaker->sound)
if(speaker->sound)
{
strip->speaker_handle = AUD_addSequence(scene->sound_scene, speaker->sound->playback_handle, strip->start / FPS, -1, 0);
AUD_setRelativeSequence(strip->speaker_handle, 0);