empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HD Pack Builder: Fixed crash when using "Power Off" while recording

Browse source
This commit is contained in:
Souryo 2017-08-09 17:44:52 -04:00
parent 17b6d233a6
commit ef6e6c74cf
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/Console.cpp
View file

@ -57,6 +57,7 @@ void Console::Release()
bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile)
{
SoundMixer::StopAudio();
StopRecordingHdPack();
if(!_romFilepath.empty() && _mapper) {
//Ensure we save any battery file before loading a new game
@ -442,6 +443,7 @@ void Console::Run()
}
_rewindManager.reset();
StopRecordingHdPack();
SoundMixer::StopAudio();
MovieManager::Stop();
SoundMixer::StopRecording();
@ -657,17 +659,19 @@ void Console::StartRecordingHdPack(string saveFolder, ScaleFilterType filterType
void Console::StopRecordingHdPack()
{
Console::Pause();
std::stringstream saveState;
Instance->SaveState(saveState);
Instance->_memoryManager->UnregisterIODevice(Instance->_ppu.get());
Instance->_ppu.reset();
Instance->_ppu.reset(new PPU(Instance->_mapper.get()));
Instance->_memoryManager->RegisterIODevice(Instance->_ppu.get());
if(Instance->_hdPackBuilder) {
Console::Pause();
std::stringstream saveState;
Instance->SaveState(saveState);
Instance->_hdPackBuilder.reset();
Instance->_memoryManager->UnregisterIODevice(Instance->_ppu.get());
Instance->_ppu.reset();
Instance->_ppu.reset(new PPU(Instance->_mapper.get()));
Instance->_memoryManager->RegisterIODevice(Instance->_ppu.get());
Instance->LoadState(saveState);
Console::Resume();
Instance->_hdPackBuilder.reset();
Instance->LoadState(saveState);
Console::Resume();
}
}