[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39646] branches/soc-2011-pepper/source/ blender/blenkernel/intern/sound.c: Bugfix: Removing a sound from a speaker resulted in a crash.

[Joerg Mueller]

Revision: 39646
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39646
Author:   nexyon
Date:     2011-08-23 11:44:24 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
Bugfix: Removing a sound from a speaker resulted in a crash.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/blenkernel/intern/sound.c

Modified: branches/soc-2011-pepper/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenkernel/intern/sound.c   
2011-08-23 11:28:18 UTC (rev 39645)
+++ branches/soc-2011-pepper/source/blender/blenkernel/intern/sound.c   
2011-08-23 11:44:24 UTC (rev 39646)
@@ -676,11 +676,17 @@
 
                                                        
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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs