More thread-safe

src/musicscanner.cpp

@@ -107,21 +107,36 @@ MusicScanner::listerFinished( const QMap<QString, unsigned int>& newmtimes )
     foreach( const QString& s, m_skippedFiles )
         qDebug() << s;
 
-    m_dirListerThreadController->quit();
+    QMetaObject::invokeMethod( this, "quitLister" );
-    m_dirLister->deleteLater();
 }
 
+void
+MusicScanner::quitLister()
+{
+    qDebug() << Q_FUNC_INFO;
+    if( m_dirListerThreadController->isRunning() )
+    {
+        qDebug() << "Scan thread still running, not deleting yet";
+        m_dirListerThreadController->quit();
+        QMetaObject::invokeMethod( this, "quitLister" );
+    }
+    else
+    {
+        qDebug() << "deleting dir lister";
+        m_dirLister->deleteLater();
+        m_dirLister = 0;
+    }
+}
 
 void
 MusicScanner::listerDestroyed( QObject* dirLister )
 {
     qDebug() << Q_FUNC_INFO;
-    m_dirLister = 0;
     m_dirListerThreadController->deleteLater();
     m_dirListerThreadController = 0;
+    emit finished();
 }
 
-
 void
 MusicScanner::commitBatch( const QVariantList& tracks )
 {

src/musicscanner.h

@@ -89,7 +89,7 @@ public:
 
 signals:
     //void fileScanned( QVariantMap );
-    void finished( int, int );
+    void finished();
     void batchReady( const QVariantList& );
 
 private:
@@ -97,6 +97,7 @@ private:
 
 private slots:
     void listerFinished( const QMap<QString, unsigned int>& newmtimes );
+    void quitLister();
     void listerDestroyed( QObject* dirLister );
     void scanFile( const QFileInfo& fi );
     void startScan();

src/scanmanager.cpp

@@ -29,9 +29,13 @@ ScanManager::ScanManager( QObject* parent )
 
 ScanManager::~ScanManager()
 {
+    qDebug() << Q_FUNC_INFO;
     s_instance = 0;
+    if( m_musicScannerThreadController )
+    {
         m_musicScannerThreadController->quit();
         m_musicScannerThreadController->deleteLater();
+    }
     m_musicScannerThreadController = 0;
     m_scanner = 0;    
 }
@@ -52,22 +56,39 @@ ScanManager::runManualScan( const QString& path )
     if ( !m_musicScannerThreadController && !m_scanner ) //still running if these are not zero
     {
         m_musicScannerThreadController = new QThread( this );
-        MusicScanner* m_scanner = new MusicScanner( path );
+        m_scanner = new MusicScanner( path );
         m_scanner->moveToThread( m_musicScannerThreadController );
-        connect( m_scanner, SIGNAL( destroyed( QObject* ) ), this, SLOT( scannerDestroyed( QObject* ) ) );
+        connect( m_scanner, SIGNAL( finished() ), SLOT( scannerFinished() ) );
+        connect( m_scanner, SIGNAL( destroyed( QObject* ) ), SLOT( scannerDestroyed( QObject* ) ) );
         m_musicScannerThreadController->start( QThread::IdlePriority );
         QMetaObject::invokeMethod( m_scanner, "startScan" );
     }
+    else
+        qDebug() << "Could not run manual scan, old scan still running";
 }
 
+void
+ScanManager::scannerFinished()
+{
+    qDebug() << Q_FUNC_INFO;
+    if( m_musicScannerThreadController->isRunning() )
+    {
+        qDebug() << "Scan thread still running, not deleting yet";
+        m_musicScannerThreadController->quit();
+        QMetaObject::invokeMethod( this, "scannerFinished" );
+    }
+    else
+    {
+        delete m_scanner;
+        m_scanner = 0;
+    }
+}
 
 void
 ScanManager::scannerDestroyed( QObject* scanner )
 {
     qDebug() << Q_FUNC_INFO;
-    m_musicScannerThreadController->quit();
     m_musicScannerThreadController->deleteLater();
     m_musicScannerThreadController = 0;
-    m_scanner = 0;
 }
 

src/scanmanager.h

@@ -21,6 +21,7 @@ public:
     void runManualScan( const QString& path );
 
 private slots:
+    void scannerFinished();
     void scannerDestroyed( QObject* scanner );
 
     void onSettingsChanged();