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

Merge pull request #6706 from fr500/fixes 

fix #6700
This commit is contained in:
Twinaphex 2018-05-03 12:19:12 +02:00 committed by GitHub
parent 896ac3c89f 7bdbd005a8
commit d877bccde5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/input_driver.c
View File

@ -651,7 +651,7 @@ void input_poll(void)
int16_t input_state(unsigned port, unsigned device, int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id) unsigned idx, unsigned id)
{ {
int16_t res = 0; int16_t res = 0, res_overlay = 0;
/* used to reset input state of a button when the gamepad mapper /* used to reset input state of a button when the gamepad mapper
is in action for that button*/ is in action for that button*/
@ -696,7 +696,7 @@ int16_t input_state(unsigned port, unsigned device,
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (overlay_ptr) if (overlay_ptr)
input_state_overlay(overlay_ptr, &res, port, device, idx, id); input_state_overlay(overlay_ptr, &res_overlay, port, device, idx, id);
#endif #endif
#ifdef HAVE_NETWORKGAMEPAD #ifdef HAVE_NETWORKGAMEPAD
@ -722,7 +722,7 @@ int16_t input_state(unsigned port, unsigned device,
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (input_overlay_is_alive(overlay_ptr) && port == 0) if (input_overlay_is_alive(overlay_ptr) && port == 0)
res |= input_overlay_key_pressed(overlay_ptr, id); res |= res_overlay(overlay_ptr, id);
#endif #endif
} }
else else