Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-09-28 14:45:39 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-09-28 14:45:39 +0400
commit78c7ec6401e1ce1c6889bcaba7397e815d992c17 (patch)
treea9bc57ac451b9d940d5dd5ab0799db25cf4d9786 /intern
parentf90fdd6e8b747e444552d7a6e2c7b93499c4c090 (diff)
parentc8b0d25794be3dc98375fb4042746bd31a4ba961 (diff)
Merging r40615 through r40652 from trunk into soc-2011-tomato
Diffstat (limited to 'intern')
-rw-r--r--intern/audaspace/intern/AUD_SequencerReader.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp
index c468de19580..c8af1161530 100644
--- a/intern/audaspace/intern/AUD_SequencerReader.cpp
+++ b/intern/audaspace/intern/AUD_SequencerReader.cpp
@@ -132,8 +132,14 @@ void AUD_SequencerReader::read(int& length, bool& eos, sample_t* buffer)
while(eit != m_factory->m_entries.end())
{
- handle = new AUD_SequencerHandle(*eit, m_device);
- handles.push_front(handle);
+ try
+ {
+ handle = new AUD_SequencerHandle(*eit, m_device);
+ handles.push_front(handle);
+ }
+ catch(AUD_Exception&)
+ {
+ }
eit++;
}