From e43a3374e118f5a15e8681c1d98f59d4844eff0d Mon Sep 17 00:00:00 2001
From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Sat, 30 Sep 2017 13:28:05 +0800
Subject: [PATCH] Update JSReturn

---
 src/drivers/libretro/libretro.c | 12 ++++++------
 src/input.c                     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index d784522..0c4e7d3 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -85,7 +85,7 @@ unsigned sndvolume = 150;
 static volatile int nofocus = 0;
 
 static int32_t *sound = 0;
-static uint32_t JSReturn[4];
+static uint32_t JSReturn = 0;
 static uint32_t MouseData[3];
 static uint32_t current_palette = 0;
 
@@ -542,7 +542,7 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
       {
          case RETRO_DEVICE_JOYPAD:
             t[port] = RETRO_DEVICE_JOYPAD;
-            FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn[0], 0);
+            FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn, 0);
             break;
          case RETRO_DEVICE_MOUSE:
             t[port] = RETRO_DEVICE_MOUSE;
@@ -1178,7 +1178,7 @@ static void FCEUD_UpdateInput(void)
       }
    }
 
-   JSReturn[0] = pad[0] | (pad[1] << 8) | (pad[2] << 16) | (pad[3] << 24);
+   JSReturn = pad[0] | (pad[1] << 8) | (pad[2] << 16) | (pad[3] << 24);
 
    if (t[0] == RETRO_DEVICE_MOUSE || t[1] == RETRO_DEVICE_MOUSE)
       GetMouseData(&MouseData[0]);
@@ -1737,8 +1737,8 @@ bool retro_load_game(const struct retro_game_info *game)
       return false;
    }
 
-   FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn[0], 0);
-   FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn[0], 0);
+   FCEUI_SetInput(0, SI_GAMEPAD, &JSReturn, 0);
+   FCEUI_SetInput(1, SI_GAMEPAD, &JSReturn, 0);
 
    external_palette_exist = ipalette;
    if (external_palette_exist)
@@ -1769,7 +1769,7 @@ bool retro_load_game(const struct retro_game_info *game)
    {
       if (famicom_4p_db_list[i].crc == iNESGameCRC32)
       {
-         FCEUI_SetInputFC(SIFC_4PLAYER, &JSReturn[0], 0);
+         FCEUI_SetInputFC(SIFC_4PLAYER, &JSReturn, 0);
          break;
       }
    }
diff --git a/src/input.c b/src/input.c
index ca57ad5..ff01bd5 100644
--- a/src/input.c
+++ b/src/input.c
@@ -227,7 +227,7 @@ void FCEU_UpdateInput(void)
    if (GameInfo && GameInfo->type == GIT_VSUNI)
       if (coinon) coinon--;
 
-   if (GameInfo->type == GIT_VSUNI) 		/* moved to libretro.c */
+   if (GameInfo->type == GIT_VSUNI)
       FCEU_VSUniSwap(&joy[0], &joy[1]);
 }