From 2302f0eb414e47caedfb46f84f81f9221a53f3e6 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeff@tomahawk-player.org>
Date: Tue, 26 Jun 2012 08:39:27 -0400
Subject: [PATCH] Fix borked if-logic

---
 src/libtomahawk/filemetadata/ScanManager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libtomahawk/filemetadata/ScanManager.cpp b/src/libtomahawk/filemetadata/ScanManager.cpp
index 7aeb65d38..7d65e61f1 100644
--- a/src/libtomahawk/filemetadata/ScanManager.cpp
+++ b/src/libtomahawk/filemetadata/ScanManager.cpp
@@ -229,11 +229,11 @@ ScanManager::filesDeleted()
 void
 ScanManager::runScan()
 {
-    qDebug() << Q_FUNC_INFO;
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO;
 
     QStringList paths = m_currScannerPaths.empty() ? TomahawkSettings::instance()->scannerPaths() : m_currScannerPaths;
 
-    if ( !m_musicScannerThreadController && m_scanner.isNull() ) //still running if these are not zero
+    if ( m_musicScannerThreadController || !m_scanner.isNull() ) //still running if these are not zero
     {
         m_scanner = QWeakPointer< MusicScanner >( new MusicScanner( m_currScanMode, paths ) );
         m_scanner.data()->moveToThread( m_musicScannerThreadController );
@@ -251,8 +251,8 @@ ScanManager::runScan()
 void
 ScanManager::scannerFinished()
 {
-    tDebug() << "deleting scanner";
-    if ( !m_scanner.isNull() )
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO;
+    if ( m_musicScannerThreadController && !m_scanner.isNull() )
     {
         m_musicScannerThreadController->quit();
         m_musicScannerThreadController->wait( 60000 );