From 4a09dfdb30022b9a022b05999ea39cd5d143c956 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 19 Nov 2017 16:47:34 -0500 Subject: [PATCH] fix netplay join with touch --- menu/cbs/menu_cbs_select.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index 74ca3ef2c8..bdca580865 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -233,14 +233,9 @@ static int menu_cbs_init_bind_select_compare_type( BIND_ACTION_SELECT(cbs, action_select_input_desc_kbd); } #endif -#ifdef HAVE_NETWORKING - else if (type == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM) - { - BIND_ACTION_SELECT(cbs, action_select_netplay_connect_room); - } -#endif else { + switch (type) { case FILE_TYPE_USE_DIRECTORY: @@ -268,6 +263,14 @@ int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, BIND_ACTION_SELECT(cbs, action_select_default); +#ifdef HAVE_NETWORKING + if (cbs->enum_idx == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM) + { + BIND_ACTION_SELECT(cbs, action_select_netplay_connect_room); + return 0; + } +#endif + if (cbs->setting) { uint64_t flags = cbs->setting->flags;