Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Stop engine work queue before destructing environment

Browse source 
To avoid access to null and dangling pointers from active work items on
quitting.
This commit is contained in:
elsid 2021-05-25 13:44:40 +02:00
parent f8e02000ec
commit f7a6be053d
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/sceneutil/workqueue.cpp
View file

@ -33,14 +33,25 @@ bool WorkItem::isDone() const
return mDone;
}
WorkQueue::WorkQueue(int workerThreads)
WorkQueue::WorkQueue(std::size_t workerThreads)
: mIsReleased(false)
{
for (int i=0; i<workerThreads; ++i)
mThreads.emplace_back(std::make_unique<WorkThread>(*this));
start(workerThreads);
}
WorkQueue::~WorkQueue()
{
stop();
}
void WorkQueue::start(std::size_t workerThreads)
{
while (mThreads.size() < workerThreads)
mThreads.emplace_back(std::make_unique<WorkThread>(*this));
mIsReleased = false;
}
void WorkQueue::stop()
{
{
std::unique_lock<std::mutex> lock(mMutex);