mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

* Guard pipeline against dupe queries.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-25 03:43:05 +02:00
parent 9801370a47
commit 3e0092d299
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/pipeline.cpp
View File

@@ -116,11 +116,13 @@ Pipeline::resolve( const QList<query_ptr>& qlist, bool prioritized, bool tempora
int i = 0; int i = 0;
foreach( const query_ptr& q, qlist ) foreach( const query_ptr& q, qlist )
{ {
if ( !m_qids.contains( q->id() ) )
m_qids.insert( q->id(), q );
if ( m_queries_pending.contains( q ) ) if ( m_queries_pending.contains( q ) )
continue; continue;
if ( m_qidsState.contains( q->id() ) )
continue;
if ( !m_qids.contains( q->id() ) )
m_qids.insert( q->id(), q );
if ( prioritized ) if ( prioritized )
m_queries_pending.insert( i++, q ); m_queries_pending.insert( i++, q );

2
src/libtomahawk/query.cpp
View File

@@ -176,6 +176,8 @@ Query::onResolvingFinished()
if ( !m_resolveFinished ) if ( !m_resolveFinished )
{ {
m_resolveFinished = true; m_resolveFinished = true;
m_resolvers.clear();
emit resolvingFinished( m_solved ); emit resolvingFinished( m_solved );
} }
} }