summaryrefslogtreecommitdiff
path: root/Source/Plugins
diff options
context:
space:
mode:
authorayuanx <ayuanx@gmail.com>2009-12-30 14:37:12 +0000
committerayuanx <ayuanx@gmail.com>2009-12-30 14:37:12 +0000
commit151ff28ab7dd1fd0343587f194bf8620d5fc3620 (patch)
treea47f43544c2c44fc52b529f3eacf2c78c3b8c490 /Source/Plugins
parent97779ea295b025d013ed07fc3b0f6bf99def6c5a (diff)
Fixed mem leak caused by not releasing pad & wiimote plugin when shutdown
Fixed main frame crash after shutdown git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4755 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins')
-rw-r--r--Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index 71169a9500..c18e7da6d8 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -714,7 +714,6 @@ void Shutdown()
g_EmulatorRunning = false;
#ifdef _WIN32
- dinput.Free();
// Kill xpad rumble
XINPUT_VIBRATION vib;
vib.wLeftMotorSpeed = 0;
@@ -722,6 +721,7 @@ void Shutdown()
for (int i = 0; i < 4; i++)
if (pad[i].bRumble)
XInputSetState(pad[i].XPadPlayer, &vib);
+ dinput.Free();
#endif
SaveConfig();
}