1 files changed, 6 insertions, 4 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index 78ca4363..44af40e3 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -82,18 +82,19 @@ instance XMPPSession UnixSession where
         L.putStrLn $ "SESSION: jid " <++> jid
         return jid
     closeSession _             = L.putStrLn "SESSION: close"
-    subscribeToPresence session Nothing = do
+    subscribe session Nothing = do
         let tmvar = greedySubscriber (presence_state session)
         chan <- atomically $
             (do (cnt,chan) <- takeTMVar tmvar
                 putTMVar tmvar (cnt+1,chan)
-                return chan )
+                chan' <- dupTChan chan
+                return chan' )
           `orElse`
             (do chan <- newTChan
                 putTMVar tmvar (1,chan)
                 return chan )
         return chan
-    subscribeToPresence session (Just jid) = do
+    subscribe session (Just jid) = do
         let tvar = subscriberMap (presence_state session)
         atomically $ do
             subs <- readTVar tvar
@@ -104,7 +105,8 @@ instance XMPPSession UnixSession where
                       newchan <- newTChan
                       return (newchan, Map.insert jid (1,newchan) subs)
                     Just (cnt,chan) -> do
-                      return (chan, Map.insert jid (cnt+1,chan) subs)
+                      chan' <- dupTChan chan
+                      return (chan', Map.insert jid (cnt+1,chan) subs)
             writeTVar tvar subs'
             return chan