mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4480 from fr500/master

Browse Source 
fixes
This commit is contained in:
Twinaphex 2017-01-23 00:26:49 +01:00 committed by GitHub
commit 9152d7e9c4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/xmb.c
View File

@ -1484,8 +1484,10 @@ static xmb_node_t* xmb_get_node(xmb_handle_t *xmb, unsigned i)
return &xmb->history_tab_node;
case XMB_SYSTEM_TAB_ADD:
return &xmb->add_tab_node;
#ifdef HAVE_NETWORKING
case XMB_SYSTEM_TAB_NETPLAY:
return &xmb->netplay_tab_node;
#endif
default:
if (i > xmb->system_tab_end)
return xmb_get_userdata_from_horizontal_list(
@ -3817,12 +3819,14 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action
menu_stack->list[stack_size - 1].type =
MENU_ADD_TAB;
break;
#ifdef HAVE_NETWORKING
case XMB_SYSTEM_TAB_NETPLAY:
menu_stack->list[stack_size - 1].label =
strdup(msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB));
menu_stack->list[stack_size - 1].type =
MENU_NETPLAY_TAB;
break;
#endif
default:
menu_stack->list[stack_size - 1].label =
strdup(msg_hash_to_str(MENU_ENUM_LABEL_HORIZONTAL_MENU));

5
tasks/task_netplay_crc.c
View File

@ -63,9 +63,12 @@ static void netplay_crc_scan_callback(void *task_data,
break;
}
static char content_path[PATH_MAX_LENGTH];
snprintf(content_path, sizeof(content_path), "%s", state->path);
command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
task_push_content_load_default(
info->list[i].path, state->path,
info->list[i].path, content_path,
&content_info,
CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU,