Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11069 from jherico/overlay_deadlocks

Browse source 
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
This commit is contained in:
Chris Collins 2017-07-28 09:25:26 -07:00 committed by GitHub
commit 20513ccf83
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Overlays.h
View file

@ -323,7 +323,7 @@ signals:
private:
void cleanupOverlaysToDelete();
mutable QMutex _mutex;
mutable QMutex _mutex { QMutex::Recursive };
QMap<OverlayID, Overlay::Pointer> _overlaysHUD;
QMap<OverlayID, Overlay::Pointer> _overlaysWorld;
#if OVERLAY_PANELS