Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-26 01:09:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7091 from jherico/overlayCrash

Browse source 
Prevent overlay cleanup from crashing the app
This commit is contained in:
Seth Alves 2016-02-11 16:26:07 -08:00
commit 90d81bc17b
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,9 +37,16 @@
Overlays::Overlays() : _nextOverlayID(1) { Overlays::Overlays() : _nextOverlayID(1) {
connect(qApp, &Application::beforeAboutToQuit, [=] {
cleanupAllOverlays();
});
} }
Overlays::~Overlays() { Overlays::~Overlays() {
}
void Overlays::cleanupAllOverlays() {
{ {
QWriteLocker lock(&_lock); QWriteLocker lock(&_lock);
QWriteLocker deleteLock(&_deleteLock); QWriteLocker deleteLock(&_deleteLock);
@ -53,7 +60,6 @@ Overlays::~Overlays() {
_overlaysWorld.clear(); _overlaysWorld.clear();
_panels.clear(); _panels.clear();
} }
cleanupOverlaysToDelete(); cleanupOverlaysToDelete();
} }

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

@ -145,6 +145,7 @@ signals:
private: private:
void cleanupOverlaysToDelete(); void cleanupOverlaysToDelete();
void cleanupAllOverlays();
QMap<unsigned int, Overlay::Pointer> _overlaysHUD; QMap<unsigned int, Overlay::Pointer> _overlaysHUD;
QMap<unsigned int, Overlay::Pointer> _overlaysWorld; QMap<unsigned int, Overlay::Pointer> _overlaysWorld;