1 files changed, 7 insertions, 1 deletions

diff --git a/dht/src/Network/Tox/AggregateSession.hs b/dht/src/Network/Tox/AggregateSession.hs
index d1f42e91..feb634f0 100644
--- a/dht/src/Network/Tox/AggregateSession.hs
+++ b/dht/src/Network/Tox/AggregateSession.hs
@@ -31,6 +31,7 @@ import Data.Function
 import qualified Data.IntMap.Strict  as IntMap
          ;import Data.IntMap.Strict  (IntMap)
 import Data.List
+import Data.Maybe
 import Data.Time.Clock.POSIX
 import System.IO.Error
 
@@ -108,6 +109,7 @@ newAggregateSession notify = do
 data AddResult = FirstSession    -- ^ Initial connection with this contact.
                | AddedSession    -- ^ Added another connection to active session.
                | RejectedSession -- ^ Failed to add session (wrong contact / closed session).
+    deriving (Eq,Show)
 
 -- | The 'keepAlive' thread juggles three scheduled tasks.
 data KeepAliveEvents = DoTimeout        -- ^ A session timed-out, close it.
@@ -244,7 +246,9 @@ addSession c s = do
                                 return (result,Just con,singleSession <$> s0)
 
     mapM_ sClose rejected
-    forM_ (mcon :: Maybe SingleCon) $ \con ->
+    when (isNothing mcon) $ dput XMan "addSession: Rejected session!"
+    forM_ (mcon :: Maybe SingleCon) $ \con -> do
+        dput XMan $ "addSession: forkSession! " ++ show result
         forkSession c s $ \progress -> do
             status0 <- aggregateStatus c
             writeTVar (singleStatus con) progress
@@ -314,6 +318,8 @@ closeAll :: AggregateSession -> IO ()
 closeAll c = join $ atomically $ do
     imap <- readTVar (contactSession c)
     closeTMChan (contactChannel c)
+    forM_ (listToMaybe $ IntMap.elems imap) $ \(SingleCon s _) -> do
+        notifyState c c s Dormant
     return $ forM_ (IntMap.toList imap) $ \(sid,SingleCon s _) -> do
         sClose s
         delSession c sid