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

LilyPad: Another pair of fixes for related bugs in the thread safety stuff. First could cause crashes when stopping/resuming/restarting emulation, second would cause devices to fail to restart properly (Or, more accurately, restart too early) when doing the same. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1906 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
mattmenke 2009-09-23 05:19:17 +00:00
parent cfaeb06c05
commit cd7f88aa73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/LilyPad/LilyPad.cpp
View File

@ -391,7 +391,7 @@ void Update(unsigned int port, unsigned int slot) {
static unsigned int LastCheck = 0;
unsigned int t = timeGetTime();
if (t - LastCheck < 15) return;
if (t - LastCheck < 15 || !openCount) return;
if (windowThreadId != GetCurrentThreadId()) {
if (stateUpdated[0] < 0) {
@ -804,13 +804,13 @@ ExtraWndProcResult HackWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
UpdateEnabledDevices(1);
}
break;
case WM_ACTIVATEAPP:
case WM_ACTIVATE:
// Release any buttons PCSX2 may think are down when
// losing/gaining focus.
if (!wParam) {
ReleaseModifierKeys();
}
activeWindow = wParam != 0;
activeWindow = (LOWORD(wParam) != WA_INACTIVE);
UpdateEnabledDevices();
break;
case WM_CLOSE:
@ -947,8 +947,8 @@ s32 CALLBACK PADopen(void *pDsp) {
void CALLBACK PADclose() {
if (openCount && !--openCount) {
DEBUG_TEXT_OUT("LilyPad closed\n\n");
dm->ReleaseInput();
ReleaseEatenProc();
dm->ReleaseInput();
hWnd = 0;
ClearKeyQueue();
}