games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-25 12:14:46 +02:00
Code Issues Releases Activity

Fixed deadlock in WaterAdopter

Browse Source
This commit is contained in:
Tomasz Zieliński 2023-05-19 20:49:01 +02:00
parent 73d9f5bd0a
commit 72f8facc82
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/rmg/WaterAdopter.cpp
View File

@ -35,7 +35,6 @@ void WaterAdopter::process()
void WaterAdopter::init() void WaterAdopter::init()
{ {
//make dependencies //make dependencies
DEPENDENCY_ALL(WaterAdopter);
DEPENDENCY(TownPlacer); DEPENDENCY(TownPlacer);
POSTFUNCTION(ConnectionsPlacer); POSTFUNCTION(ConnectionsPlacer);
POSTFUNCTION(TreasurePlacer); POSTFUNCTION(TreasurePlacer);
@ -224,7 +223,10 @@ void WaterAdopter::createWater(EWaterContent::EWaterContent waterContent)
} }
} }
{
Zone::Lock waterLock(map.getZones()[waterZoneId]->areaMutex);
map.getZones()[waterZoneId]->area().unite(waterArea); map.getZones()[waterZoneId]->area().unite(waterArea);
}
Zone::Lock lock(zone.areaMutex); Zone::Lock lock(zone.areaMutex);
zone.area().subtract(waterArea); zone.area().subtract(waterArea);
zone.areaPossible().subtract(waterArea); zone.areaPossible().subtract(waterArea);