Fixed movies when recording "from start" a game that has different soft/hard reset behavior. (Recording/Played a movie from the start now forces a hard reset)

This commit is contained in:
Souryo 2015-07-05 19:35:38 -04:00
parent c25ef7f07a
commit 3daf877133
3 changed files with 5 additions and 5 deletions

View File

@ -83,12 +83,12 @@ wstring Console::GetROMPath()
return filepath;
}
void Console::Reset()
void Console::Reset(bool softReset)
{
Movie::Stop();
if(Instance) {
Console::Pause();
Instance->ResetComponents(true);
Instance->ResetComponents(softReset);
Console::Resume();
}
}

View File

@ -47,7 +47,7 @@ class Console
~Console();
void Run();
void Stop();
static void Reset();
static void Reset(bool softReset = true);
//Used to pause the emu loop to perform thread-safe operations
static void Pause();

View File

@ -77,7 +77,7 @@ void Movie::StartRecording(wstring filename, bool reset)
Reset();
if(reset) {
Console::Reset();
Console::Reset(false);
} else {
Console::SaveState(_startState);
}
@ -114,7 +114,7 @@ void Movie::PlayMovie(wstring filename)
//Restore state if one was present in the movie
Console::LoadState(_startState);
} else {
Console::Reset();
Console::Reset(false);
}
_playing = true;
Console::Resume();