1 files changed, 12 insertions, 6 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index d81ed1e3..515f155d 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -514,11 +514,11 @@ dnssdDiscover tox ni toxid = do
 
 forkTox :: Tox extra -> Bool -> IO (IO (), [NodeInfo] -> [NodeInfo] -> IO (), [NodeInfo] -> [NodeInfo] -> IO ())
 forkTox tox with_avahi = do
-    _ <- forkListener "toxHandshakes" (toxHandshakes tox)
-    _ <- forkListener "toxToRoute" (toxToRoute tox)
-    _ <- forkListener "toxOnion" (clientNet $ toxOnion tox)
-    _ <- forkListener "toxDHT" (clientNet $ toxDHT tox)
-    quit <- forkListener "toxCrypto" (toxCrypto tox)
+    quitHs      <- forkListener "toxHandshakes" (toxHandshakes tox)
+    quitToRoute <- forkListener "toxToRoute" (toxToRoute tox)
+    quitOnion   <- forkListener "toxOnion" (clientNet $ toxOnion tox)
+    quitDHT     <- forkListener "toxDHT" (clientNet $ toxDHT tox)
+    quitNC      <- forkListener "toxCrypto" (toxCrypto tox)
     quitAvahi <- if with_avahi then do
                     forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
                     forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
@@ -529,7 +529,13 @@ forkTox tox with_avahi = do
                     return $ forM_ [dnssdIn,dnssdOut] killThread
                  else return $ return ()
     keygc <- Onion.forkAnnouncedKeysGC (toxAnnouncedKeys tox)
-    return ( quitAvahi >> killThread keygc >> quit
+    return ( do quitAvahi
+                killThread keygc
+                quitNC
+                quitDHT
+                quitOnion
+                quitToRoute
+                quitHs
            , bootstrap (DHT.refresher4 $ toxRouting tox)
            , bootstrap (DHT.refresher6 $ toxRouting tox)
            )