1 files changed, 18 insertions, 11 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index f6df1525..0103ba46 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -456,22 +456,29 @@ stanzaFromList stype reply = do
         mid   = stanzaTag >>= lookupAttrib "id" . tagAttrs
         mfrom = stanzaTag >>= lookupAttrib "from" . tagAttrs
         mto = stanzaTag >>= lookupAttrib "to" . tagAttrs
+        {-
         isInternal (InternalEnableHack {}) = True
         isInternal (InternalCacheId {}) = True
         isInternal _ = False
-    atomically $ do
-        donevar <- newEmptyTMVar
+        -}
+    (donevar,replyChan,replyClsrs) <- atomically $ do
+        donevar <- newEmptyTMVar -- TMVar ()
         replyChan <- newLockedChan
         replyClsrs <- newTVar (Just [])
-        return Stanza { stanzaType = stype
-                      , stanzaId = mid
-                      , stanzaTo = mto      -- as-is from reply list
-                      , stanzaFrom = mfrom  -- as-is from reply list
-                      , stanzaChan = replyChan
-                      , stanzaClosers = replyClsrs
-                      , stanzaInterrupt = donevar
-                      , stanzaOrigin = LocalPeer
-                      }
+        return (donevar,replyChan, replyClsrs)
+    forkIO $ do
+        forM_ reply $ atomically . writeLChan replyChan
+        atomically $ do putTMVar donevar ()
+                        writeTVar replyClsrs Nothing
+    return Stanza { stanzaType = stype
+                  , stanzaId = mid
+                  , stanzaTo = mto      -- as-is from reply list
+                  , stanzaFrom = mfrom  -- as-is from reply list
+                  , stanzaChan = replyChan
+                  , stanzaClosers = replyClsrs
+                  , stanzaInterrupt = donevar
+                  , stanzaOrigin = LocalPeer
+                  }
 
 grokStanzaIQGet :: Monad m => XML.Event -> NestingXML o m (Maybe StanzaType)
 grokStanzaIQGet stanza = do