Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-13 21:06:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move write lock in Overlays::overlayDrawOnChanged to encompass reads

Browse source
This commit is contained in:
Ryan Huffman 2014-12-31 10:16:29 -08:00
parent 5caec4dea5
commit 7478b631da
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/ui/overlays/Overlays.cpp
View file

@ -454,10 +454,10 @@ void RayToOverlayIntersectionResultFromScriptValue(const QScriptValue& object, R
}
void Overlays::overlayDrawOnChanged(Base3DOverlay* overlay) {
QWriteLocker lock(&_lock);
if (overlay->getDrawOnHUD()) {
for (unsigned int id : _overlaysWorld.keys()) {
if (_overlaysWorld[id] == overlay) {
QWriteLocker lock(&_lock);
_overlaysWorld.remove(id);
_overlaysHUD[id] = overlay;
}
@ -465,7 +465,6 @@ void Overlays::overlayDrawOnChanged(Base3DOverlay* overlay) {
} else {
for (unsigned int id : _overlaysHUD.keys()) {
if (_overlaysHUD[id] == overlay) {
QWriteLocker lock(&_lock);
_overlaysHUD.remove(id);
_overlaysWorld[id] = overlay;
}