More thread cleanup.

1 files changed, 5 insertions, 3 deletions

diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 98c03b80..b396c2ea 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -414,9 +414,9 @@ forkTox tox with_avahi = do
     quitDHT     <- forkListener "toxDHT" (clientNet $ toxDHT tox)
     quitNC      <- forkListener "toxCrypto" (toxCrypto tox)
     quitTCP     <- forkListener "relay-client" (clientNet $ tcpClient $ tcpKademliaClient $ toxOnionRoutes tox)
+    refresher4 <- forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
+    refresher6 <- forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
     quitAvahi <- if with_avahi then do
-                    forkPollForRefresh (DHT.refresher4 $ toxRouting tox)
-                    forkPollForRefresh (DHT.refresher6 $ toxRouting tox)
                     dnssdIn <- forkIO $ queryToxService (dnssdDiscover tox)
                     dnssdOut <- forkIO $ dnssdAnnounce tox
                     labelThread dnssdIn  "tox-avahi-monitor"
@@ -424,7 +424,9 @@ forkTox tox with_avahi = do
                     return $ forM_ [dnssdIn,dnssdOut] killThread
                  else return $ return ()
     keygc <- Onion.forkAnnouncedKeysGC (toxAnnouncedKeys tox)
-    return ( do quitAvahi
+    return ( do killThread refresher4
+                killThread refresher6
+                quitAvahi
                 killThread keygc
                 quitNC
                 quitDHT