2 files changed, 5 insertions, 2 deletions

diff --git a/Presence/ConsoleWriter.hs b/Presence/ConsoleWriter.hs
index 9b62b00f..90849727 100644
--- a/Presence/ConsoleWriter.hs
+++ b/Presence/ConsoleWriter.hs
@@ -5,6 +5,7 @@ module ConsoleWriter
     , newConsoleWriter
     , writeActiveTTY
     , writeAllPty
+    , cwClients
     ) where
 
 import Control.Monad
diff --git a/xmppServer.hs b/xmppServer.hs
index efd790d0..ef71380b 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -604,8 +604,10 @@ answerProbe state mto k chan = do
 
     replies <- runTraversableT $ do
         cbu <- lift . atomically $ readTVar (clientsByUser state)
-        lpres <- liftMaybe $ Map.lookup u cbu
-        clientState <- liftT $ Map.elems (networkClients lpres)
+        let lpres = maybeToList $ Map.lookup u cbu
+        cw <- lift . atomically $ readTVar (cwClients $ consoleWriter state)
+        clientState <- liftT $ (lpres >>= Map.elems . networkClients)
+                                ++ Map.elems cw
         stanza <- liftIOMaybe $ atomically (readTVar (clientStatus clientState))
         stanza <- lift $ cloneStanza stanza
         let jid = unsplitJID (Just $ clientUser clientState