1 files changed, 11 insertions, 10 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index 41204818..adae567a 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -109,7 +109,7 @@ data PresenceState = forall status. PresenceState
 
 
 newPresenceState :: Maybe ConsoleWriter
-                 -> Maybe (ToxManager ConnectionKey)
+                 -> Maybe (PresenceState -> ToxManager ConnectionKey)
                  -> TMVar (XMPPServer, Connection.Manager status Text)
                  -> IO PresenceState
 newPresenceState cw toxman xmpp = atomically $ do
@@ -117,15 +117,16 @@ newPresenceState cw toxman xmpp = atomically $ do
         clientsByUser <- newTVar Map.empty
         remotesByPeer <- newTVar Map.empty
         keyToChan <- newTVar Map.empty
-        return PresenceState
-            { clients       = clients
-            , clientsByUser = clientsByUser
-            , remotesByPeer = remotesByPeer
-            , keyToChan     = keyToChan
-            , server        = xmpp
-            , consoleWriter = cw
-            , toxManager    = toxman
-            }
+        let st = PresenceState
+                    { clients       = clients
+                    , clientsByUser = clientsByUser
+                    , remotesByPeer = remotesByPeer
+                    , keyToChan     = keyToChan
+                    , server        = xmpp
+                    , consoleWriter = cw
+                    , toxManager    = Nothing
+                    }
+        return $ st { toxManager = fmap ($ st) toxman }
 
 
 nameForClient :: PresenceState -> ConnectionKey -> IO Text