Ver0.22

diff --git a/foldermodel.cpp b/foldermodel.cpp
index 2badaf2..45ea7d6 100644 (file)
--- a/foldermodel.cpp
+++ b/foldermodel.cpp
@@ -39,8 +39,6 @@ FolderModel::FolderModel(QObject *parent) :
     m_worker->moveToThread(thread);\r
     connect(m_worker, SIGNAL(resultReady(QString,QPixmap)), this, SLOT(thumbnail_Ready(QString,QPixmap)));\r
     connect(m_worker, SIGNAL(finished()), thread, SLOT(quit()));\r
-    connect(m_worker, SIGNAL(finished()), m_worker, SLOT(deleteLater()));\r
-    connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));\r
     connect(thread, SIGNAL(started()), m_worker, SLOT(doWork()));\r
     thread->start();\r
 \r
@@ -55,6 +53,8 @@ FolderModel::FolderModel(QObject *parent) :
 FolderModel::~FolderModel()\r
 {\r
     m_worker->finish();\r
+    m_worker->thread()->quit();\r
+    m_worker->thread()->wait();\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////////\r

diff --git a/thumbnailworker.cpp b/thumbnailworker.cpp
index cda15e7..06e9ed7 100644 (file)
--- a/thumbnailworker.cpp
+++ b/thumbnailworker.cpp
@@ -1,5 +1,6 @@
 #include "thumbnailworker.h"
 
+#include <QDebug>
 #include <QTimer>
 #include <QThread>
 
@@ -27,6 +28,7 @@ void ThumbnailWorker::finish()
 {
     QMutexLocker locker(&m_mutex);
     m_loop = false;
+    qDebug() << "ThumbnailWorker::finish()";
 }
 
 QString ThumbnailWorker::getPath()
@@ -67,4 +69,5 @@ void ThumbnailWorker::doWork()
     }
 
     emit finished();
+    qDebug() << "ThumbnailWorker::doWork() finished.";
 }