Merge pull request #6937 from spycrab/hotfix_fifo

Qt: Fix crash on game start
2018-05-22 04:44:14 +02:00 · 2018-05-22 04:44:14 +02:00 · f64bd401b6
parent 59be5da24c 6747543502
commit f64bd401b6
1 changed files with 3 additions and 1 deletions
--- a/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp
+++ b/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp
@ -215,7 +215,9 @@ void FIFOPlayerWindow::StopRecording()
 void FIFOPlayerWindow::OnEmulationStarted()
 {
  UpdateControls();
-  OnFIFOLoaded();
+
+  if (FifoPlayer::GetInstance().GetFile())
+    OnFIFOLoaded();
 }

 void FIFOPlayerWindow::OnEmulationStopped()