From cfcb0b7fbcbfa6aaede5b9a571525e8aac650860 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Thu, 17 May 2018 20:15:29 +0300 Subject: [PATCH] [app] Set target thread for HashTask --- app/src/BooksBook.cpp | 9 ++++----- harbour-lib | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/BooksBook.cpp b/app/src/BooksBook.cpp index e35bade..da1b171 100644 --- a/app/src/BooksBook.cpp +++ b/app/src/BooksBook.cpp @@ -300,7 +300,7 @@ void BooksBook::GuessCoverTask::performTask() class BooksBook::HashTask : public HarbourTask { public: - HashTask(QThreadPool* aPool, QString aPath); + HashTask(QThreadPool* aPool, QThread* aTargetThread, QString aPath); virtual void performTask(); @@ -309,8 +309,8 @@ public: QByteArray iHash; }; -BooksBook::HashTask::HashTask(QThreadPool* aPool, QString aPath) : - HarbourTask(aPool), iPath(aPath) +BooksBook::HashTask::HashTask(QThreadPool* aPool, QThread* aTargetThread, + QString aPath) : HarbourTask(aPool, aTargetThread), iPath(aPath) { } @@ -390,8 +390,7 @@ BooksBook::BooksBook(const BooksStorage& aStorage, QString aRelativePath, if (iHash.isEmpty()) { HDEBUG("need to calculate hash for" << qPrintable(iPath)); iHashTaskQueue = BooksTaskQueue::hashQueue(); - iHashTask = new HashTask(iHashTaskQueue->pool(), iPath); - iHashTask->moveToThread(thread()); + iHashTask = new HashTask(iHashTaskQueue->pool(), thread(), iPath); iHashTask->submit(this, SLOT(onHashTaskDone())); } // Refcounted BooksBook objects are managed by C++ code diff --git a/harbour-lib b/harbour-lib index b0fda2f..7574d41 160000 --- a/harbour-lib +++ b/harbour-lib @@ -1 +1 @@ -Subproject commit b0fda2fea0c7381d74bf848902c48cbbcd3f6a8e +Subproject commit 7574d4159407022dff5eb7ccbc805048a8f61b51