From 3a725ee6f63ece01b844da37b7fbcec2b5a17c91 Mon Sep 17 00:00:00 2001 From: "MattMenke@gmail.com" Date: Fri, 12 Feb 2010 23:07:07 +0000 Subject: [PATCH] LilyPad: Fix for testing rumble breaking test button. Jake was the one who broke it, not me. Honest. Should fix issue 531. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2589 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/LilyPad/Config.cpp | 2 ++ plugins/LilyPad/WndProcEater.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp index 8997f98518..dcb7c7db52 100644 --- a/plugins/LilyPad/Config.cpp +++ b/plugins/LilyPad/Config.cpp @@ -1533,6 +1533,8 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l UnselectAll(hWndList); } else if (cmd == ID_TEST) { + // Just in case... + if (selected) break; Device *dev; Binding *b; ForceFeedbackBinding *ffb = 0; diff --git a/plugins/LilyPad/WndProcEater.cpp b/plugins/LilyPad/WndProcEater.cpp index 370da80d45..3fb4e57660 100644 --- a/plugins/LilyPad/WndProcEater.cpp +++ b/plugins/LilyPad/WndProcEater.cpp @@ -46,6 +46,9 @@ void WndProcEater::ReleaseExtraProc(ExtraWndProc proc) { void WndProcEater::Release() { while (numExtraProcs) ReleaseExtraProc(extraProcs[0].proc); RemoveProp( hWndEaten, L"LilyHaxxor" ); + if (hWndEaten && IsWindow(hWndEaten)) { + SetWindowLongPtr(hWndEaten, GWLP_WNDPROC, (LONG_PTR)eatenWndProc); + } } LRESULT WndProcEater::_OverrideWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)