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

Fix merge

Browse Source
This commit is contained in:
Leo Franchi
2012-05-19 17:40:53 -04:00
parent a3bcf52529
commit a36693bd4c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/AclRegistry.cpp
View File

@@ -200,10 +200,7 @@ ACLRegistry::queueNextJob()
if ( m_jobCount != 0 ) if ( m_jobCount != 0 )
return; return;
<<<<<<< HEAD
tDebug() << Q_FUNC_INFO << "jobQueue size = " << m_jobQueue.length(); tDebug() << Q_FUNC_INFO << "jobQueue size = " << m_jobQueue.length();
=======
>>>>>>> master
if ( !m_jobQueue.isEmpty() ) if ( !m_jobQueue.isEmpty() )
{ {
AclJobItem* job = m_jobQueue.dequeue(); AclJobItem* job = m_jobQueue.dequeue();