From 75182bfc6f170310a2a328884882e6d97db1e9bf Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Sun, 21 May 2017 22:48:30 -0500
Subject: [PATCH] fix errors due to rebase

---
 command.c              | 6 ++++--
 menu/cbs/menu_cbs_ok.c | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/command.c b/command.c
index 1f8a595a56..f4f96e66a9 100644
--- a/command.c
+++ b/command.c
@@ -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;
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b0eb67991f..606bb2b436 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -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);
    }