2 files changed, 9 insertions, 0 deletions

diff --git a/src/Network/KRPC.hs b/src/Network/KRPC.hs
index 69a4efca..3b722ac2 100644
--- a/src/Network/KRPC.hs
+++ b/src/Network/KRPC.hs
@@ -59,6 +59,7 @@ module Network.KRPC
          -- ** Query
        , QueryFailure (..)
        , query
+       , getQueryCount
 
          -- ** Handler
        , HandlerFailure (..)
diff --git a/src/Network/KRPC/Manager.hs b/src/Network/KRPC/Manager.hs
index 468744c1..e2b60b6a 100644
--- a/src/Network/KRPC/Manager.hs
+++ b/src/Network/KRPC/Manager.hs
@@ -29,6 +29,7 @@ module Network.KRPC.Manager
          -- * Queries
        , QueryFailure (..)
        , query
+       , getQueryCount
 
          -- * Handlers
        , HandlerFailure (..)
@@ -232,6 +233,13 @@ genTransactionId ref = do
   cur <- atomicModifyIORef' ref $ \ cur -> (succ cur, cur)
   return $ BC.pack (show cur)
 
+-- | How many times 'query' call have been performed.
+getQueryCount :: MonadKRPC h m => m Int
+getQueryCount = do
+  Manager {..} <- getManager
+  curTrans <- liftIO $ readIORef transactionCounter
+  return $ curTrans - optSeedTransaction options
+
 registerQuery :: CallId -> PendingCalls -> IO CallRes
 registerQuery cid ref = do
   ares <- newEmptyMVar