From 547dc76ca82f89d7df1c1d7520cea369257be01d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 6 Mar 2011 17:05:49 +0100 Subject: [PATCH] * Fixed becameSolved() signal in Query class. --- src/libtomahawk/query.cpp | 16 ++++++++-------- src/libtomahawk/query.h | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/libtomahawk/query.cpp b/src/libtomahawk/query.cpp index 98d7feb5e..3611b803d 100644 --- a/src/libtomahawk/query.cpp +++ b/src/libtomahawk/query.cpp @@ -44,7 +44,7 @@ Query::addResults( const QList< Tomahawk::result_ptr >& newresults ) { bool becameSolved = false; { - QMutexLocker lock( &m_mut ); +// QMutexLocker lock( &m_mut ); m_results.append( newresults ); qStableSort( m_results.begin(), m_results.end(), Query::resultSorter ); @@ -81,7 +81,7 @@ void Query::removeResult( const Tomahawk::result_ptr& result ) { { - QMutexLocker lock( &m_mut ); +// QMutexLocker lock( &m_mut ); m_results.removeAll( result ); } @@ -101,7 +101,7 @@ Query::onResolvingFinished() QList< result_ptr > Query::results() const { - QMutexLocker lock( &m_mut ); +// QMutexLocker lock( &m_mut ); return m_results; } @@ -109,7 +109,7 @@ Query::results() const unsigned int Query::numResults() const { - QMutexLocker lock( &m_mut ); +// QMutexLocker lock( &m_mut ); return m_results.length(); } @@ -148,16 +148,16 @@ Query::checkResults() { bool becameSolved = false; bool becameUnsolved = true; - + // hook up signals, and check solved status foreach( const result_ptr& rp, m_results ) { - if ( !m_solved && rp->score() > 0.99 ) + if ( !m_solved && rp->score() > 0.99 && rp->collection()->source()->isOnline() ) { m_solved = true; becameSolved = true; } - if ( rp->score() > 0.99 ) + if ( rp->score() > 0.99 && rp->collection()->source()->isOnline() ) { becameUnsolved = false; } @@ -166,7 +166,7 @@ Query::checkResults() if ( m_solved && becameUnsolved ) { m_solved = false; - emit solvedStateChanged( true ); + emit solvedStateChanged( false ); } if( becameSolved ) diff --git a/src/libtomahawk/query.h b/src/libtomahawk/query.h index f49eeb889..d82972f10 100644 --- a/src/libtomahawk/query.h +++ b/src/libtomahawk/query.h @@ -84,8 +84,7 @@ private slots: private: void clearResults(); void checkResults(); - - mutable QMutex m_mut; + QList< Tomahawk::result_ptr > m_results; bool m_solved; mutable QID m_qid;