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

Attempt to fix a potential scanner deadlock

Browse Source
This commit is contained in:
Jeff Mitchell
2012-09-25 19:28:08 -04:00
committed by Dominik Schmidt
parent d388b3608e
commit 38211e166f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,12 +268,14 @@ void
ScanManager::scannerFinished() ScanManager::scannerFinished()
{ {
tLog( LOGVERBOSE ) << Q_FUNC_INFO; tLog( LOGVERBOSE ) << Q_FUNC_INFO;
if ( !m_scanner.isNull() ) if ( !m_scanner.isNull() || m_musicScannerThreadController )
{ {
m_musicScannerThreadController->quit(); m_musicScannerThreadController->quit();
m_musicScannerThreadController->wait( 60000 ); m_musicScannerThreadController->wait( 60000 );
delete m_scanner.data(); if ( !m_scanner.isNull() )
delete m_scanner.data();
delete m_musicScannerThreadController; delete m_musicScannerThreadController;
m_musicScannerThreadController = 0; m_musicScannerThreadController = 0;
} }