mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

* Prevent locking?

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-05-20 03:04:30 +02:00
parent 10f636e6ea
commit c5d7cbf2ef
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/pipeline.cpp
View File

@@ -284,7 +284,12 @@ Pipeline::shunt( const query_ptr& q )
// qDebug() << Q_FUNC_INFO << q->solved() << q->toString() << q->id(); // qDebug() << Q_FUNC_INFO << q->solved() << q->toString() << q->id();
unsigned int lastweight = 0; unsigned int lastweight = 0;
unsigned int lasttimeout = 0; unsigned int lasttimeout = 0;
int rc;
int thisResolver = 0; int thisResolver = 0;
{
QMutexLocker lock( &m_mut );
rc = m_resolvers.count();
}
if ( !q->resolvingFinished() ) if ( !q->resolvingFinished() )
{ {
@@ -319,9 +324,7 @@ Pipeline::shunt( const query_ptr& q )
if ( lastweight > 0 ) if ( lastweight > 0 )
{ {
q->setLastPipelineWeight( lastweight ); q->setLastPipelineWeight( lastweight );
QMutexLocker lock( &m_mut ); if ( thisResolver < rc )
if ( thisResolver < m_resolvers.count() )
{ {
// qDebug() << "Shunting in" << lasttimeout << "ms, q:" << q->toString(); // qDebug() << "Shunting in" << lasttimeout << "ms, q:" << q->toString();