ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: try to make loadstates crash less frequently by fixing spu/mainthread race condition

This commit is contained in:
zeromus 2010-12-19 04:45:05 +00:00
parent f13fabcc73
commit e2c27f9c88
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/windows/hotkey.cpp
View File

@ -40,6 +40,7 @@
#include "path.h" #include "path.h"
#include "video.h" #include "video.h"
#include "winutil.h" #include "winutil.h"
#include "windriver.h"
extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function
@ -196,6 +197,9 @@ void HK_StateLoadSlot(int num, bool justPressed)
{ {
if (romloaded && justPressed) if (romloaded && justPressed)
{ {
//keep the spu from running while we do the loadstate (or else it may trample on spu structures in the midst of getting twiddled)
Lock lock;
BOOL wasPaused = paused; BOOL wasPaused = paused;
Pause(); Pause();
loadstate_slot(num); //Loadstate loadstate_slot(num); //Loadstate