From 5c0b8ad9b6130b550b59878d4d4630827e178c1b Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 15 Nov 2012 13:24:19 +0100 Subject: [PATCH] * Don't cleanup scanning prematurely. --- src/libtomahawk/filemetadata/MusicScanner.cpp | 4 ++-- src/libtomahawk/filemetadata/ScanManager.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp index 47ef62db2..2a2fd65e3 100644 --- a/src/libtomahawk/filemetadata/MusicScanner.cpp +++ b/src/libtomahawk/filemetadata/MusicScanner.cpp @@ -214,7 +214,6 @@ MusicScanner::scanFilePaths() } - void MusicScanner::postOps() { @@ -243,7 +242,8 @@ MusicScanner::postOps() m_filesToDelete.clear(); } - cleanup(); + if ( !m_cmdQueue ) + cleanup(); } diff --git a/src/libtomahawk/filemetadata/ScanManager.cpp b/src/libtomahawk/filemetadata/ScanManager.cpp index e2042c74b..08c223400 100644 --- a/src/libtomahawk/filemetadata/ScanManager.cpp +++ b/src/libtomahawk/filemetadata/ScanManager.cpp @@ -219,7 +219,6 @@ ScanManager::runFileScan( const QStringList &paths ) } - void ScanManager::fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& mtimes ) {