* We should still remove the query from the pending list in Pipeline.

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 );
 

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();
 }

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;