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

I forgot that a thread that is a QObject doesn't do run() and hence doesn't terminate itself -- sending quit signals so the threads don't terminate while still running

Browse Source
This commit is contained in:
Jeff Mitchell
2011-02-15 12:34:46 -05:00
parent c38c510059
commit c561a2a845
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/musicscanner.cpp
View File

@@ -107,6 +107,7 @@ MusicScanner::listerFinished( const QMap<QString, unsigned int>& newmtimes )
foreach( const QString& s, m_skippedFiles ) foreach( const QString& s, m_skippedFiles )
qDebug() << s; qDebug() << s;
m_dirListerThreadController->quit();
m_dirLister->deleteLater(); m_dirLister->deleteLater();
} }

5
src/scanmanager.cpp
View File

@@ -30,9 +30,9 @@ ScanManager::ScanManager( QObject* parent )
ScanManager::~ScanManager() ScanManager::~ScanManager()
{ {
s_instance = 0; s_instance = 0;
m_musicScannerThreadController->quit();
m_musicScannerThreadController->deleteLater(); m_musicScannerThreadController->deleteLater();
m_musicScannerThreadController = 0; m_musicScannerThreadController = 0;
m_scanner->deleteLater();
m_scanner = 0; m_scanner = 0;
} }
@@ -65,8 +65,9 @@ void
ScanManager::scannerDestroyed( QObject* scanner ) ScanManager::scannerDestroyed( QObject* scanner )
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
m_scanner = 0; m_musicScannerThreadController->quit();
m_musicScannerThreadController->deleteLater(); m_musicScannerThreadController->deleteLater();
m_musicScannerThreadController = 0; m_musicScannerThreadController = 0;
m_scanner = 0;
} }