mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-31 15:32:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a potential crash when mapping keys to Wiimote

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4703 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx 2009-12-17 16:14:48 +00:00
parent 7d1fdb85f3
commit f255f08a99
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Plugins/Plugin_Wiimote/Src/ConfigGamepad.cpp
View file

@ -410,6 +410,7 @@ void WiimotePadConfigDialog::DoGetButtons(int _GetId)
int value; // Axis value or Hat value
int type; // Button type
int KeyPressed = 0;
int pressed = 0;
bool Succeed = false;
bool Stop = false; // Stop the timer
@ -426,8 +427,6 @@ void WiimotePadConfigDialog::DoGetButtons(int _GetId)
// Save the button Id
GetButtonWaitingID = _GetId;
GetButtonWaitingTimer = 0;
// Reset the key in case we happen to have an old one
g_Pressed = 0;
// Start the timer
#if wxUSE_TIMER
@ -446,7 +445,7 @@ void WiimotePadConfigDialog::DoGetButtons(int _GetId)
{
InputCommon::GetButton(
WiiMoteEmu::joyinfo[PadID].joy, PadID, WiiMoteEmu::joyinfo[PadID].NumButtons, WiiMoteEmu::joyinfo[PadID].NumAxes, WiiMoteEmu::joyinfo[PadID].NumHats,
g_Pressed, value, type, pressed, Succeed, Stop,
KeyPressed, value, type, pressed, Succeed, Stop,
LeftRight, Axis, XInput, Button, Hat, NoTriggerFilter);
}
@ -523,7 +522,7 @@ void WiimotePadConfigDialog::DoGetButtons(int _GetId)
}
// If we got a bad button
if(g_Pressed == -1)
if(KeyPressed == -1)
{
// Update text
SetButtonTextAll(_GetId, (char *)"PAD: -1");