From cbb3d463b697b958366dacb2f8100fd691aaaed9 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Thu, 13 Nov 2014 23:29:05 +0100 Subject: [PATCH] Fixed Overlays::isLoaded which did not to find my just created overlay. --- interface/src/ui/overlays/Overlays.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index 6702c88125..00b16cf5b7 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -359,14 +359,14 @@ void RayToOverlayIntersectionResultFromScriptValue(const QScriptValue& object, R bool Overlays::isLoaded(unsigned int id) { QReadLocker lock(&_lock); - Overlay* overlay = _overlays2D.value(id); - if (!overlay) { - _overlays3D.value(id); - } - if (!overlay) { + Overlay* thisOverlay = NULL; + if (_overlays2D.contains(id)) { + thisOverlay = _overlays2D[id]; + } else if (_overlays3D.contains(id)) { + thisOverlay = _overlays3D[id]; + } else { return false; // not found } - - return overlay->isLoaded(); + return thisOverlay->isLoaded(); }