1 files changed, 10 insertions, 1 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 2c7dcdee..b0d5a2e5 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2200,13 +2200,22 @@ void do_friends(Messenger *m)
             }
 
             friend_new_connection(m, i, m->friendlist[i].client_id);
-            uint8_t dht_public_key[crypto_box_PUBLICKEYBYTES];
+        }
 
+        if (m->friendlist[i].crypt_connection_id != -1) {
+            uint8_t dht_public_key[crypto_box_PUBLICKEYBYTES];
             uint64_t timestamp = onion_getfriend_DHT_pubkey(m->onion_c, m->friendlist[i].onion_friendnum, dht_public_key);
+
             if (timestamp != 0) {
                 set_connection_dht_public_key(m->net_crypto, m->friendlist[i].crypt_connection_id, dht_public_key, timestamp);
             }
 
+            timestamp = get_connection_dht_key(m->net_crypto, m->friendlist[i].crypt_connection_id, dht_public_key);
+
+            if (timestamp != 0) {
+                onion_set_friend_DHT_pubkey(m->onion_c, m->friendlist[i].onion_friendnum, dht_public_key, timestamp);
+            }
+
             uint8_t direct_connected;
             unsigned int status = crypto_connection_status(m->net_crypto, m->friendlist[i].crypt_connection_id, &direct_connected);