From b1b09837af03f95cdc8a8d8889e37177d5aa23b7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 12 Sep 2017 08:46:08 +0200 Subject: [PATCH] Revert "Always set controller port device descriptors" This reverts commit 0ced9ca9131d41e3a1eb849fd4e43052f85d2b6a. --- command.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/command.c b/command.c index e4abf8477f..499931aa85 100644 --- a/command.c +++ b/command.c @@ -1015,6 +1015,7 @@ static void command_event_init_controllers(void) RARCH_LOG("%s %u.\n", msg_hash_to_str(MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT), i + 1); + set_controller = true; break; case RETRO_DEVICE_JOYPAD: break; @@ -1023,14 +1024,18 @@ static void command_event_init_controllers(void) * This is broken behavior of course, but avoid breaking * cores needlessly. */ RARCH_LOG("%s %u: %s (ID: %u).\n", - msg_hash_to_str(MSG_CONNECTING_TO_PORT), - device, ident, i+1); + msg_hash_to_str(MSG_CONNECTING_TO_PORT), + device, ident, i+1); + set_controller = true; break; } - pad.device = device; - pad.port = i; - core_set_controller_port_device(&pad); + if (set_controller) + { + pad.device = device; + pad.port = i; + core_set_controller_port_device(&pad); + } } }