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

Fix borked if-logic

Browse Source
This commit is contained in:
Jeff Mitchell
2012-06-26 08:39:27 -04:00
parent c14984c647
commit 2302f0eb41
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/filemetadata/ScanManager.cpp
View File

@@ -229,11 +229,11 @@ ScanManager::filesDeleted()
void void
ScanManager::runScan() ScanManager::runScan()
{ {
qDebug() << Q_FUNC_INFO; tLog( LOGVERBOSE ) << Q_FUNC_INFO;
QStringList paths = m_currScannerPaths.empty() ? TomahawkSettings::instance()->scannerPaths() : m_currScannerPaths; 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 = QWeakPointer< MusicScanner >( new MusicScanner( m_currScanMode, paths ) );
m_scanner.data()->moveToThread( m_musicScannerThreadController ); m_scanner.data()->moveToThread( m_musicScannerThreadController );
@@ -251,8 +251,8 @@ ScanManager::runScan()
void void
ScanManager::scannerFinished() ScanManager::scannerFinished()
{ {
tDebug() << "deleting scanner"; tLog( LOGVERBOSE ) << Q_FUNC_INFO;
if ( !m_scanner.isNull() ) if ( m_musicScannerThreadController && !m_scanner.isNull() )
{ {
m_musicScannerThreadController->quit(); m_musicScannerThreadController->quit();
m_musicScannerThreadController->wait( 60000 ); m_musicScannerThreadController->wait( 60000 );