diff --git a/src/blackcore/threadedreader.cpp b/src/blackcore/threadedreader.cpp index 2ec67587b..bc5c4e31d 100644 --- a/src/blackcore/threadedreader.cpp +++ b/src/blackcore/threadedreader.cpp @@ -165,7 +165,10 @@ namespace BlackCore { // sApp->hasWebDataServices() cannot be used, as some readers are already used during init phase if (!this->isEnabled()) { return false; } - if (this->isAbandoned()) { return false; } + + // MS 2019-02-23 isAbandoned() check only makes sense when called by worker thread (T541) + if (CThreadUtils::isCurrentThreadObjectThread(this) && this->isAbandoned()) { return false; } + if (!m_unitTest && (!sApp || sApp->isShuttingDown())) { return false; } return true; }