UI: Fixed "pause when movie finishes" option not working

SourMesen · Jul 3, 2024 · 523b173 · 523b173
1 parent 4d92cc6
commit 523b173
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/Core/Shared/Movies/MesenMovie.cpp b/Core/Shared/Movies/MesenMovie.cpp
@@ -38,18 +38,17 @@ void MesenMovie::Stop()
 			MessageManager::DisplayMessage("Movies", isEndOfMovie ? "MovieEnded" : "MovieStopped");
 		}
 
-		if(!_emu->IsEmulationThread()) {
-			EmuSettings* settings = _emu->GetSettings();
-			if(isEndOfMovie && settings->GetPreferences().PauseOnMovieEnd) {
-				_emu->Pause();
-			}
-			_emu->GetCheatManager()->SetCheats(_originalCheats);
-
-			Serializer backup(0, false);
-			backup.LoadFrom(_emuSettingsBackup);
-			backup.Stream(*settings, "", -1);
+		EmuSettings* settings = _emu->GetSettings();
+		if(isEndOfMovie && settings->GetPreferences().PauseOnMovieEnd) {
+			_emu->PauseOnNextFrame();
 		}
 
+		_emu->GetCheatManager()->SetCheats(_originalCheats);
+
+		Serializer backup(0, false);
+		backup.LoadFrom(_emuSettingsBackup);
+		backup.Stream(*settings, "", -1);
+
 		_playing = false;
 	}