From 304981c28bd05bff370bca7d100d6468dc83f035 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 9 Aug 2011 01:59:57 +0200
Subject: [PATCH] * We should still remove the query from the pending list in
 Pipeline.

---
 src/PipelineStatusView.cpp   | 2 +-
 src/libtomahawk/pipeline.cpp | 4 ++++
 src/libtomahawk/query.cpp    | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/PipelineStatusView.cpp b/src/PipelineStatusView.cpp
index c9efda9a6..c6206a076 100644
--- a/src/PipelineStatusView.cpp
+++ b/src/PipelineStatusView.cpp
@@ -66,7 +66,7 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
 void
 PipelineStatusView::onPipelineUpdate( const query_ptr& query )
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug() << Q_FUNC_INFO << query.isNull();
 
     QTreeWidgetItem* ti = m_tree->invisibleRootItem()->child( 0 );
 
diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp
index ad1d801da..3e055d512 100644
--- a/src/libtomahawk/pipeline.cpp
+++ b/src/libtomahawk/pipeline.cpp
@@ -289,6 +289,10 @@ Pipeline::shunt( const query_ptr& q )
         if ( r->timeout() > 0 )
             new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
     }
+    else
+    {
+        setQIDState( q, 0 );
+    }
 
     shuntNext();
 }
diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp
index d31de8aed..eda3ae385 100644
--- a/src/libtomahawk/query.cpp
+++ b/src/libtomahawk/query.cpp
@@ -169,6 +169,7 @@ Query::removeResult( const Tomahawk::result_ptr& result )
 void
 Query::onResolvingFinished()
 {
+    tDebug() << "Finished resolving:" << toString();
     if ( !m_resolveFinished )
     {
         m_resolveFinished = true;