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

Ref T541 Abandoned worker shouldn't interrupt if it's in the owner's thread.

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-02-18 15:50:11 +00:00
parent 5de96382bc
commit 7b4d3874a6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackmisc/worker.cpp
View File

@@ -114,18 +114,19 @@ namespace BlackMisc
void CWorkerBase::abandon() noexcept
{
thread()->requestInterruption();
if (thread() != thread()->thread()) { thread()->requestInterruption(); }
quit();
}
void CWorkerBase::abandonAndWait() noexcept
{
thread()->requestInterruption();
if (thread() != thread()->thread()) { thread()->requestInterruption(); }
quitAndWait();
}
bool CWorkerBase::isAbandoned() const
{
Q_ASSERT(thread() == QThread::currentThread());
return thread()->isInterruptionRequested();
}