1 files changed, 11 insertions, 20 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index a6bfbc8a..5dbed346 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2408,6 +2408,17 @@ uint32_t messenger_run_interval(Messenger *m)
 /* The main loop that needs to be run at least 20 times per second. */
 void do_messenger(Messenger *m)
 {
+    // Add the TCP relays, but only if this is the first time calling do_messenger
+    if(m->has_added_relays == 0)
+    {
+        m->has_added_relays = 1;
+
+        int i;
+        for (i = 0; i < NUM_SAVED_TCP_RELAYS; ++i) {
+            add_tcp_relay(m->net_crypto, m->loaded_relays[i].ip_port, m->loaded_relays[i].client_id);
+        }
+    }
+
     unix_time_update();
 
     if (!m->options.udp_disabled) {
@@ -2554,7 +2565,6 @@ void do_messenger(Messenger *m)
 #define MESSENGER_STATE_TYPE_PATH_NODE     11
 
 #define SAVED_FRIEND_REQUEST_SIZE 1024
-#define NUM_SAVED_TCP_RELAYS 8
 #define NUM_SAVED_PATH_NODES 8
 struct SAVED_FRIEND {
     uint8_t status;
@@ -2859,25 +2869,6 @@ int messenger_load(Messenger *m, const uint8_t *data, uint32_t length)
         return -1;
 }
 
-/* Connect after loading messenger from file */
-int messenger_connect(Messenger *m)
-{
-    int i;
-
-    if(m == NULL)
-        return -1;
-
-    DHT *dht = m->dht;
-    if(DHT_connect_after_load(dht) == -1)
-        return -1;
-
-    for (i = 0; i < NUM_SAVED_TCP_RELAYS; ++i) {
-        add_tcp_relay(m->net_crypto, m->loaded_relays[i].ip_port, m->loaded_relays[i].client_id);
-    }
-
-    return 0;
-}
-
 /* Return the number of friends in the instance m.
  * You should use this to determine how much memory to allocate
  * for copy_friendlist. */