HD Packs: Fixed crash when loading save states

Core/SaveStateManager.cpp

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

Core/VideoDecoder.cpp

@@ -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;

Core/stdafx.h

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