Merge pull request #8397 from stenzek/fifoci-fix

Fix FifoCI
dolphin-emu · Oct 9, 2019 · 6dbb5cc · 6dbb5cc
2 parents 6e613f4 + 7c28606
commit 6dbb5cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -25,7 +25,8 @@ AlsaSound::~AlsaSound()
   // Give the opportunity to the audio thread
   // to realize we are stopping the emulation
   cv.notify_one();
-  thread.join();
+  if (thread.joinable())
+    thread.join();
 }
 
 bool AlsaSound::Init()

diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -64,6 +64,7 @@ void InitSoundStream()
     WARN_LOG(AUDIO, "Could not initialize backend %s, using %s instead.", backend.c_str(),
              BACKEND_NULLSOUND);
     g_sound_stream = std::make_unique<NullSound>();
+    g_sound_stream->Init();
   }
 
   UpdateSoundStream();