mirror of
https://github.com/libretro/Mesen.git
synced 2024-12-13 20:42:24 +00:00
Movies: Fixed issue when auto-configure input option is enabled
This commit is contained in:
parent
6e077f5743
commit
ff95758a87
@ -100,16 +100,19 @@ bool MesenMovie::Play(VirtualFile &file)
|
||||
ControlManager::RegisterInputProvider(this);
|
||||
ApplySettings();
|
||||
|
||||
_gameLoaded = false;
|
||||
_firstFrameNumber = 0;
|
||||
|
||||
if(!LoadGame()) {
|
||||
//Disable auto-configure input option (otherwise the movie file's input types are ignored)
|
||||
bool autoConfigureInput = EmulationSettings::CheckFlag(EmulationFlags::AutoConfigureInput);
|
||||
EmulationSettings::ClearFlags(EmulationFlags::AutoConfigureInput);
|
||||
_gameLoaded = LoadGame();
|
||||
EmulationSettings::SetFlagState(EmulationFlags::AutoConfigureInput, autoConfigureInput);
|
||||
|
||||
if(!_gameLoaded) {
|
||||
Console::Resume();
|
||||
return false;
|
||||
}
|
||||
|
||||
_gameLoaded = true;
|
||||
_firstFrameNumber = 0;
|
||||
|
||||
stringstream saveStateData;
|
||||
if(_reader->GetStream("SaveState.mst", saveStateData)) {
|
||||
if(!SaveStateManager::LoadState(saveStateData, true)) {
|
||||
|
Loading…
Reference in New Issue
Block a user