Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2024-05-20 05:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

HD Packs: Fixed crash when loading save states

Browse source
This commit is contained in:
Sour 2020-02-11 22:56:38 -05:00
parent 3cc5398165
commit f2112dbadc
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/SaveStateManager.cpp
View file

@ -178,7 +178,9 @@ bool SaveStateManager::LoadState(istream &stream, bool hashCheckRequired)
#ifndef LIBRETRO
vector<uint8_t> frameData;
if(GetScreenshotData(frameData, stream)) {
_console->GetVideoDecoder()->UpdateFrameSync(frameData.data());
if(_console->IsPaused()) {
_console->GetVideoDecoder()->UpdateFrameSync(frameData.data());
}
}
#endif
}

8
Core/VideoDecoder.cpp
View file

@ -163,6 +163,14 @@ void VideoDecoder::UpdateFrameSync(void *ppuOutputBuffer, HdScreenInfo *hdScreen
return;
}
if(_frameChanged) {
//Last frame isn't done decoding yet - sometimes Signal() introduces a 25-30ms delay
while(_frameChanged) {
//Spin until decode is done
}
//At this point, we are sure that the decode thread is no longer busy
}
_frameNumber = _console->GetFrameCount();
_hdScreenInfo = hdScreenInfo;
_ppuOutputBuffer = (uint16_t*)ppuOutputBuffer;

2
Core/stdafx.h
View file

@ -12,7 +12,7 @@
#include <cctype>
#include <memory>
#include <vector>
#include <array>
#include <algorithm>
#include <sstream>
#include <list>
#include <atomic>