From 06ae61479a95fbad45ff38c4ef3f62e7988c5cbb Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 8 Dec 2017 22:10:09 -0800
Subject: [PATCH] If a sound effect fails to load, substitute silence.

---
 apps/openmw/mwsound/openal_output.cpp | 35 ++++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 009c019e7..89475ea48 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -948,35 +948,42 @@ std::pair<Sound_Handle,size_t> OpenAL_Output::loadSound(const std::string &fname
 
     DecoderPtr decoder = mManager.getDecoder();
     // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
+    bool succeeded;
     if(decoder->mResourceMgr->exists(fname))
-    {
-        if(!decoder->open(fname))
-            return std::make_pair(nullptr, 0);
-    }
+        succeeded = decoder->open(fname);
     else
     {
         std::string file = fname;
         std::string::size_type pos = file.rfind('.');
         if(pos != std::string::npos)
             file = file.substr(0, pos)+".mp3";
-        if(!decoder->open(file))
-            return std::make_pair(nullptr, 0);
+        succeeded = decoder->open(file);
     }
 
     std::vector<char> data;
-    ChannelConfig chans;
-    SampleType type;
     ALenum format;
     int srate;
 
-    if(!decoder->getInfo(&srate, &chans, &type))
-        return std::make_pair(nullptr, 0);
-    format = getALFormat(chans, type);
-    if(!format) return std::make_pair(nullptr, 0);
-
-    decoder->readAll(data);
+    if(succeeded)
+    {
+        ChannelConfig chans;
+        SampleType type;
+        if(decoder->getInfo(&srate, &chans, &type))
+        {
+            format = getALFormat(chans, type);
+            if(format) decoder->readAll(data);
+        }
+    }
     decoder->close();
 
+    if(data.empty())
+    {
+        // If we failed to get any usable audio, substitute with silence.
+        format = AL_FORMAT_MONO8;
+        srate = 8000;
+        data.assign(8000, -128);
+    }
+
     ALint size;
     ALuint buf = 0;
     alGenBuffers(1, &buf);