mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-08-13 00:55:47 +02:00
parent cb2fd48bb6
commit 51ca9825dd
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
menu/cbs/menu_cbs_ok.c
View File

@ -3536,14 +3536,10 @@ static int action_ok_netplay_lan_scan(const char *path,
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
/* Enable Netplay */ /* Enable Netplay */
if (!command_event(CMD_EVENT_NETPLAY_INIT_DIRECT, (void *) host)) if (command_event(CMD_EVENT_NETPLAY_INIT_DIRECT, (void *) host))
return -1; return generic_action_ok_command(CMD_EVENT_RESUME);
return generic_action_ok_command(CMD_EVENT_RESUME);
#else
return -1;
#endif #endif
return -1;
} }
static int action_ok_browse_url_list(const char *path, static int action_ok_browse_url_list(const char *path,
@ -4226,12 +4222,10 @@ static int action_ok_load_archive_detect_core(const char *path,
} }
return 0; return 0;
case 0: case 0:
{ idx = menu_navigation_get_selection();
idx = menu_navigation_get_selection(); return generic_action_ok_displaylist_push(path, NULL,
return generic_action_ok_displaylist_push(path, NULL, label, type,
label, type, idx, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST);
idx, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST);
}
default: default:
break; break;
} }
@ -4343,15 +4337,10 @@ static int action_ok_netplay_enable_host(const char *path,
} }
/* Enable Netplay itself */ /* Enable Netplay itself */
if (!command_event(CMD_EVENT_NETPLAY_INIT, NULL)) if (command_event(CMD_EVENT_NETPLAY_INIT, NULL))
return -1; return generic_action_ok_command(CMD_EVENT_RESUME);
return generic_action_ok_command(CMD_EVENT_RESUME);
#else
return -1;
#endif #endif
return -1;
} }
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
@ -4406,13 +4395,10 @@ static int action_ok_netplay_enable_client(const char *path,
line.label = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS); line.label = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS);
line.label_setting = "no_setting"; line.label_setting = "no_setting";
line.cb = action_ok_netplay_enable_client_hostname_cb; line.cb = action_ok_netplay_enable_client_hostname_cb;
if (!menu_input_dialog_start(&line)) if (menu_input_dialog_start(&line))
return -1; return 0;
return 0;
#else
return -1;
#endif #endif
return -1;
} }
static int action_ok_netplay_disconnect(const char *path, static int action_ok_netplay_disconnect(const char *path,