[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31727] trunk/blender/intern/audaspace/ OpenAL/AUD_OpenALDevice.cpp: Fix [#23578] Blender crashes when Audio Scrubbing is on

Nathan Letwory nathan at letworyinteractive.com
Thu Sep 2 23:56:08 CEST 2010


Revision: 31727
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31727
Author:   jesterking
Date:     2010-09-02 23:56:08 +0200 (Thu, 02 Sep 2010)

Log Message:
-----------
Fix [#23578] Blender crashes when Audio Scrubbing is on
Reported by Guy Smith.

MSVC-compiled code would fall over iterator decrease on empty list. Shortest snippet to redo: http://www.pasteall.org/15408/cpp
See also http://www.pasteall.org/15409/cpp for list.end() behaviour on MSVC. Thanks to J?\195?\182rg M?\195?\188ller for assistance.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp

Modified: trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2010-09-02 18:13:06 UTC (rev 31726)
+++ trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2010-09-02 21:56:08 UTC (rev 31727)
@@ -243,7 +243,10 @@
 							stop(sound);
 						// decrement again, so that we get the next sound in the
 						// next loop run
-						--it;
+						if(m_playingSounds->empty())
+							break;
+						else
+							--it;
 					}
 					// continue playing
 					else





More information about the Bf-blender-cvs mailing list