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:
authorJoerg Mueller <nexyon@gmail.com>2010-12-27 14:32:43 +0300
committerJoerg Mueller <nexyon@gmail.com>2010-12-27 14:32:43 +0300
commit9118614d8ecd054263d2735968b2e705f2f0e818 (patch)
tree76093a7738453c2a92c034a371821269be559925 /intern
parent2ff790d0bde1faa3309d733c703fdb728b1d7836 (diff)
Fix for blender crashing when starting playback with audio without being able to open the audio file.
Diffstat (limited to 'intern')
-rw-r--r--intern/audaspace/intern/AUD_SequencerReader.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp
index 69293205498..5b546ca9d58 100644
--- a/intern/audaspace/intern/AUD_SequencerReader.cpp
+++ b/intern/audaspace/intern/AUD_SequencerReader.cpp
@@ -188,7 +188,16 @@ void AUD_SequencerReader::read(int & length, sample_t* & buffer)
delete strip->reader;
if(strip->old_sound)
- strip->reader = m_mixer->prepare(strip->old_sound->createReader());
+ {
+ try
+ {
+ strip->reader = m_mixer->prepare(strip->old_sound->createReader());
+ }
+ catch(AUD_Exception)
+ {
+ strip->reader = NULL;
+ }
+ }
else
strip->reader = NULL;
}