From ef75381a84dbd10b240d65b19fd18b6db5ed354f Mon Sep 17 00:00:00 2001
From: Pokechu22 <Pokechu022@gmail.com>
Date: Fri, 12 Feb 2021 18:50:33 -0800
Subject: [PATCH] Fix occasional deadlock when stopping FIFO playback

---
 Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
index ef8b81e8b1..8ed4481032 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
@@ -384,6 +384,8 @@ void FifoPlayer::WriteFifo(const u8* data, u32 start, u32 end)
   {
     while (IsHighWatermarkSet())
     {
+      if (CPU::GetState() != CPU::State::Running)
+        break;
       CoreTiming::Idle();
       CoreTiming::Advance();
     }