Avoid using tentative netCryptoSessionsState object.

1 files changed, 5 insertions, 3 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 09817d4e..65d151ca 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1661,8 +1661,8 @@ main = runResourceT $ liftBaseWith $ \resT -> do
 
     keysdb <- Tox.newKeysDatabase
 
-    crypto <- Tox.newCrypto
-    netCryptoSessionsState <- Tox.newSessionsState crypto Tox.defaultUnRecHook Tox.defaultCryptoDataHooks
+    _crypto <- Tox.newCrypto
+    _netCryptoSessionsState <- Tox.newSessionsState _crypto Tox.defaultUnRecHook Tox.defaultCryptoDataHooks
     (mbtox,quitTox,toxdhts,toxips,(taddrs::[SockAddr])) <- case porttox opts of
         "" -> return (Nothing,return (), Map.empty, return [],[])
         toxport -> do
@@ -1670,7 +1670,7 @@ main = runResourceT $ liftBaseWith $ \resT -> do
             hPutStrLn stderr $ "Supplied key: " ++ show (fmap (Tox.key2id . toPublic) (dhtkey opts))
             tox <- Tox.newTox keysdb
                               addrTox
-                              (Just netCryptoSessionsState)
+                              (Just _netCryptoSessionsState)
                               (dhtkey opts)
             (quitTox, toxStrap4, toxStrap6) <- Tox.forkTox tox
 
@@ -1855,6 +1855,8 @@ main = runResourceT $ liftBaseWith $ \resT -> do
                                                  , Tox.routing6 $ Tox.toxRouting tox ]
             return (Just tox, quitTox, dhts, ips, [addrTox])
 
+    let netCryptoSessionsState = maybe _netCryptoSessionsState Tox.toxCryptoSessions mbtox
+
     _ <- UPNP.requestPorts "dht-client" $ map (Datagram,) $ baddrs ++ taddrs
 
     (msv,mconns,mstate) <- case portxmpp opts of