flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 16:25:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite CWorker::waitForFinished using std::future<void> instead of QWaitCondition.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-06-21 19:06:25 +01:00
parent 95fe93a83c
commit 7a37c86782
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/worker.cpp
View File

@@ -8,7 +8,7 @@
*/ */
#include "worker.h" #include "worker.h"
#include <QWaitCondition> #include <future>
namespace BlackMisc namespace BlackMisc
{ {
@@ -44,15 +44,9 @@ namespace BlackMisc
void CWorkerBase::waitForFinished() Q_DECL_NOEXCEPT void CWorkerBase::waitForFinished() Q_DECL_NOEXCEPT
{ {
QMutex mutex; std::promise<void> promise;
QMutexLocker waitCondLock(&mutex); then([ & ] { promise.set_value(); });
QWaitCondition waitCond; promise.get_future().wait();
{
QMutexLocker finishedLock(&m_finishedMutex);
if (m_finished) { return; }
then([ & ] { mutex.lock(); mutex.unlock(); waitCond.wakeAll(); });
}
waitCond.wait(&mutex);
} }
void CContinuousWorker::start(QThread::Priority priority) void CContinuousWorker::start(QThread::Priority priority)