flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Trial to fix worker's finish "deleteLater"

Browse Source
This commit is contained in:
Klaus Basan
2018-08-23 21:53:48 +02:00
parent 19fbc345fb
commit 1b72333b05
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/worker.cpp
View File

@@ -12,6 +12,7 @@
#include "blackmisc/verify.h" #include "blackmisc/verify.h"
#include <future> #include <future>
#include <QTimer>
#include <QPointer> #include <QPointer>
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
@@ -224,9 +225,24 @@ namespace BlackMisc
{ {
this->setFinished(); this->setFinished();
auto *ownThread = thread(); QThread *ownThread = thread();
if (!ownThread) { return; } // normally never happening
moveToThread(ownThread->thread()); // move worker back to the thread which constructed it, so there is no race on deletion moveToThread(ownThread->thread()); // move worker back to the thread which constructed it, so there is no race on deletion
QMetaObject::invokeMethod(ownThread, "deleteLater");
QMetaObject::invokeMethod(this, "deleteLater"); // very sporadic crash here, changing to QSingleShot version for testing
} // QMetaObject::invokeMethod(ownThread, "deleteLater");
// QMetaObject::invokeMethod(this, "deleteLater");
QPointer<QThread> pOwnThread(ownThread);
QPointer<CContinuousWorker> myself(this);
QTimer::singleShot(0, ownThread, [ = ]
{
if (!pOwnThread) { return; }
pOwnThread->deleteLater();
});
QTimer::singleShot(0, this, [ = ]
{
if (!myself) { return; }
myself->deleteLater();
});
} }
} // ns