From 5e6253831a86d8d3cb3710391783d58e67e63fa3 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Sat, 10 Jan 2009 05:41:56 +0000 Subject: [PATCH] Fix a bug (introduced when support for w64 was added) that caused the PCM provider to never get used. Originally committed to SVN as r2682. --- aegisub/audio_provider_pcm.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aegisub/audio_provider_pcm.cpp b/aegisub/audio_provider_pcm.cpp index 6b82c2a68..0b87e0565 100644 --- a/aegisub/audio_provider_pcm.cpp +++ b/aegisub/audio_provider_pcm.cpp @@ -522,6 +522,8 @@ AudioProvider *CreatePCMAudioProvider(const wxString &filename) // Try Microsoft/IBM RIFF WAV try { provider = new RiffWavPCMAudioProvider(filename); + // don't bother trying with anything else if this works + return provider; } catch (const wxChar *msg) { provider = 0; @@ -531,11 +533,13 @@ AudioProvider *CreatePCMAudioProvider(const wxString &filename) // Try Sony Wave64 try { provider = new Wave64AudioProvider(filename); + return provider; } catch (const wxChar *msg) { provider = 0; wxLogDebug(_T("Creating Wave64 reader failed with message: %s\nProceeding to try other providers."), msg); } - return provider; + // no providers could be created + return NULL; }