From 40496686204143c3726c71c5e2bf2a1524f29b87 Mon Sep 17 00:00:00 2001 From: retro-wertz Date: Sun, 10 Sep 2017 13:30:56 +0800 Subject: [PATCH] Fix crashing when trying to connect a netplay session --- src/drivers/libretro/libretro.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c index 99ff704..29fbf75 100644 --- a/src/drivers/libretro/libretro.c +++ b/src/drivers/libretro/libretro.c @@ -533,18 +533,20 @@ void retro_set_input_state(retro_input_state_t cb) void retro_set_controller_port_device(unsigned port, unsigned device) { - switch(device) + if (port < 2) /* port #0 = player1/player3, port #1 = player2/player4 */ { - case RETRO_DEVICE_JOYPAD: - FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn[0], 0); - break; - case RETRO_DEVICE_MOUSE: - FCEUI_SetInput(port, SI_ZAPPER, &MouseData[0], 1); - break; + switch(device) + { + case RETRO_DEVICE_JOYPAD: + FCEUI_SetInput(port, SI_GAMEPAD, &JSReturn[0], 0); + break; + case RETRO_DEVICE_MOUSE: + FCEUI_SetInput(port, SI_ZAPPER, &MouseData[0], 1); + break; + } } } - void retro_set_environment(retro_environment_t cb) { static const struct retro_variable vars[] = {