mirror of
https://github.com/libretro/RetroArch
synced 2025-03-02 19:13:34 +00:00
fix errors due to rebase
This commit is contained in:
parent
bae2110bb4
commit
75182bfc6f
@ -2271,19 +2271,22 @@ bool command_event(enum event_command cmd, void *data)
|
||||
|
||||
/* new codepath, uses the same logic as init_deferred, expects
|
||||
buf to be addres|port */
|
||||
RARCH_LOG("%s\n", buf);
|
||||
if (strstr(buf, "|"))
|
||||
{
|
||||
static struct string_list *hostname = NULL;
|
||||
hostname = string_split(buf, "|");
|
||||
RARCH_LOG("%s %d\n", hostname->elems[0].data, atoi(hostname->elems[1].data));
|
||||
|
||||
if (!init_netplay(NULL, hostname->elems[0].data,
|
||||
atoi(hostname->elems[1].data)))
|
||||
{
|
||||
string_list_free(hostname);
|
||||
command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
|
||||
string_list_free(hostname);
|
||||
return false;
|
||||
}
|
||||
|
||||
string_list_free(hostname);
|
||||
}
|
||||
/* old codepath accessed via, netplay/scan local network
|
||||
not sure how/if it works, it seems it doesn't */
|
||||
@ -2308,7 +2311,6 @@ bool command_event(enum event_command cmd, void *data)
|
||||
if (!init_netplay_deferred(
|
||||
hostname->elems[0].data, atoi(hostname->elems[1].data)))
|
||||
{
|
||||
string_list_free(hostname);
|
||||
command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
|
||||
string_list_free(hostname);
|
||||
return false;
|
||||
|
@ -3156,7 +3156,7 @@ static int action_ok_netplay_connect_room(const char *path,
|
||||
{
|
||||
snprintf(tmp_hostname,
|
||||
sizeof(tmp_hostname),
|
||||
"%s:%d",
|
||||
"%s|%d",
|
||||
netplay_room_list[idx - 2].mitm_address,
|
||||
netplay_room_list[idx - 2].mitm_port);
|
||||
}
|
||||
@ -3164,7 +3164,7 @@ static int action_ok_netplay_connect_room(const char *path,
|
||||
{
|
||||
snprintf(tmp_hostname,
|
||||
sizeof(tmp_hostname),
|
||||
"%s:%d",
|
||||
"%s|%d",
|
||||
netplay_room_list[idx - 2].address,
|
||||
netplay_room_list[idx - 2].port);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user