The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-22 10:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in the virtual keyboard and removed a useless check

Browse Source
This commit is contained in:
fabio.olimpieri 2015-01-04 18:40:33 +00:00
parent aa1bb0055c
commit bf65a989fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui-sdl/gui-sdl.c
View File

@ -1462,6 +1462,8 @@ static void input_options(int joy)
virtualkey = virtkbd_get_key(); virtualkey = virtkbd_get_key();
if (virtualkey == NULL) if (virtualkey == NULL)
return; return;
if (virtualkey->ev_name == NULL)
return;
key = virtualkey->ev_name; key = virtualkey->ev_name;
switch(opt) switch(opt)
@ -1507,6 +1509,7 @@ static void virtual_keyboard(void)
virtkey_t *key =virtkbd_get_key(); virtkey_t *key =virtkbd_get_key();
if (key) {key_code = key->sdl_code;} else return; if (key) {key_code = key->sdl_code;} else return;
if (!key_code) return;
SDL_Event event_key; SDL_Event event_key;

7
src/jd-sdl/joystick.c
View File

@ -125,11 +125,8 @@ static void read_joy (unsigned int nr)
int bs = SDL_JoystickGetButton (joy, i) ? 1 : 0; int bs = SDL_JoystickGetButton (joy, i) ? 1 : 0;
setjoybuttonstate (nr, i, bs); setjoybuttonstate (nr, i, bs);
#ifdef GEKKO #ifdef GEKKO
if (!gui_is_active) if ((nr==0) && (currprefs.rumble[0])) Rumble (0,i, bs);
{ if ((nr==1) && (currprefs.rumble[1])) Rumble (1,i, bs);
if ((nr==0) && (currprefs.rumble[0])) Rumble (0,i, bs);
if ((nr==1) && (currprefs.rumble[1])) Rumble (1,i, bs);
}
#endif #endif
} }
} }