From 83b7de2d0bdd2adb3910460c7475c84f93616c30 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 20 May 2011 03:09:19 +0200 Subject: [PATCH] * Don't allow removed resolvers to break the pipeline. --- src/libtomahawk/pipeline.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/pipeline.cpp b/src/libtomahawk/pipeline.cpp index 5f936fa4d..acdc6b87c 100644 --- a/src/libtomahawk/pipeline.cpp +++ b/src/libtomahawk/pipeline.cpp @@ -323,14 +323,10 @@ Pipeline::shunt( const query_ptr& q ) if ( lastweight > 0 ) { + // qDebug() << "Shunting in" << lasttimeout << "ms, q:" << q->toString(); q->setLastPipelineWeight( lastweight ); - if ( thisResolver < rc ) - { -// qDebug() << "Shunting in" << lasttimeout << "ms, q:" << q->toString(); - - m_qidsTimeout.insert( q->id(), true ); - new FuncTimeout( lasttimeout, boost::bind( &Pipeline::timeoutShunt, this, q ), this ); - } + m_qidsTimeout.insert( q->id(), true ); + new FuncTimeout( lasttimeout, boost::bind( &Pipeline::timeoutShunt, this, q ), this ); } else {