Commit: 21eb3ce44a36b057279ba811011e387bdbf6ac69
Author: Jörg Müller
Date: Thu Jan 22 18:57:56 2015 +1300
Branches: master
https://developer.blender.org/rB21eb3ce44a36b057279ba811011e387bdbf6ac69
Fix: Audaspace threw an exception for files it could not open.
===================================================================
M intern/audaspace/intern/AUD_SequencerHandle.cpp
===================================================================
diff --git a/intern/audaspace/intern/AUD_SequencerHandle.cpp
b/intern/audaspace/intern/AUD_SequencerHandle.cpp
index 56cfa0d..aa742f7 100644
--- a/intern/audaspace/intern/AUD_SequencerHandle.cpp
+++ b/intern/audaspace/intern/AUD_SequencerHandle.cpp
@@ -47,8 +47,15 @@ void AUD_SequencerHandle::start()
// let's try playing
if(m_entry->m_sound.get())
{
- m_handle = m_device.play(m_entry->m_sound, true);
- m_3dhandle =
boost::dynamic_pointer_cast<AUD_I3DHandle>(m_handle);
+ try
+ {
+ m_handle = m_device.play(m_entry->m_sound, true);
+ m_3dhandle =
boost::dynamic_pointer_cast<AUD_I3DHandle>(m_handle);
+ }
+ catch(AUD_Exception&)
+ {
+ // handle stays invalid in case we get an exception
+ }
// after starting we have to set the properties, so let's
ensure that
m_status--;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
