mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_present_tile_crash' into 'master'

Browse source 
Add missing synchronization for present tiles modification

See merge request OpenMW/openmw!878
This commit is contained in:
psi29a 2021-05-18 08:13:25 +00:00
commit e73c0f92b8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -298,9 +298,15 @@ namespace DetourNavigator
} }
if (status == UpdateNavMeshStatus::removed || status == UpdateNavMeshStatus::lost) if (status == UpdateNavMeshStatus::removed || status == UpdateNavMeshStatus::lost)
{
const std::scoped_lock lock(mMutex);
mPresentTiles.erase(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile)); mPresentTiles.erase(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
}
else if (isSuccess(status) && status != UpdateNavMeshStatus::ignored) else if (isSuccess(status) && status != UpdateNavMeshStatus::ignored)
{
const std::scoped_lock lock(mMutex);
mPresentTiles.insert(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile)); mPresentTiles.insert(std::make_tuple(job.mAgentHalfExtents, job.mChangedTile));
}
const auto finish = std::chrono::steady_clock::now(); const auto finish = std::chrono::steady_clock::now();