Merge pull request #8095 from leoetlino/audio-race

Fix a race condition when shutting down audio stream
dolphin-emu · May 12, 2019 · 0ab4171 · 0ab4171
2 parents 707266a + 7c46497
commit 0ab4171
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
@@ -147,7 +147,9 @@ static void RunAdjacentSystems(bool running)
 {
   // NOTE: We're assuming these will not try to call Break or EnableStepping.
   Fifo::EmulatorState(running);
-  AudioCommon::SetSoundStreamRunning(running);
+  // Core is responsible for shutting down the sound stream.
+  if (s_state != State::PowerDown)
+    AudioCommon::SetSoundStreamRunning(running);
 }
 
 void Stop()