Update roster and supplied dht-key seperately (in case no dhtkey).

1 files changed, 4 insertions, 2 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 3bf7b6f1..018361aa 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -417,13 +417,15 @@ newTox keydb addr mbSessionsState suppliedDHTKey = do
                                  Just s -> return (transportCrypto s, s)
 
     roster <- newContactInfo
-    let crypto = fromMaybe crypto0 $do
+    let -- patch in supplied DHT key
+        crypto1 = fromMaybe crypto0 $do
             k <- suppliedDHTKey
             return crypto0
                 { transportSecret = k
                 , transportPublic = toPublic k
-                , userKeys = myKeyPairs roster
                 }
+        -- patch in newly allocated roster state.
+        crypto = crypto1 { userKeys = myKeyPairs roster }
     forM_ suppliedDHTKey $ \k -> do
         maybe (hPutStrLn stderr "failed to encode suppliedDHTKey")
               (C8.hPutStrLn stderr . C8.append "Using suppliedDHTKey: ")