1 files changed, 2 insertions, 5 deletions

diff --git a/Connection/Tox/Threads.hs b/Connection/Tox/Threads.hs
index f3357215..73c83338 100644
--- a/Connection/Tox/Threads.hs
+++ b/Connection/Tox/Threads.hs
@@ -116,15 +116,12 @@ persueContact getPolicy getStatus PersueContactMethods{..} statusVar = do
     whileTryingAndNotEstablished getPolicy getStatus statusVar
         $ \retryAfterTimeout ->
             orElse (do
+                    readTVar statusVar >>= check . (/= InProgress AcquiringIPAddress)
                     theirDhtKey <- DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)
                     -- We don't have an IP address yet.
                     maybe (return ()) (const retry) =<< readTVar (contactLastSeenAddr contact)
                     return $ do -- AcquiringIPAddress
-                        atomically $ do
-                            status <- readTVar statusVar
-                            if status == InProgress AcquiringIPAddress
-                                then retry
-                                else writeTVar statusVar (InProgress AcquiringIPAddress)
+                        atomically $ writeTVar statusVar (InProgress AcquiringIPAddress)
                         retryAfterTimeout 0)
                    (do
                     theirDhtKey <- DHT.dhtpk <$> retryUntilJust (contactKeyPacket contact)