From 69ae04ab095f6619ed65d4c6ac2a1b73923c7766 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 6 Sep 2018 09:03:28 -0700
Subject: [PATCH 1/3] protect Base3DOverlay::_name with a mutex

---
 interface/src/ui/overlays/Base3DOverlay.cpp | 20 ++++++++++++++++++--
 interface/src/ui/overlays/Base3DOverlay.h   |  5 +++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 6bce9d9283..767afca3e7 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -238,7 +238,9 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
  */
 QVariant Base3DOverlay::getProperty(const QString& property) {
     if (property == "name") {
-        return _name;
+        return _nameLock.resultWithReadLock<QString>([&] {
+            return _name;
+        }
     }
     if (property == "position" || property == "start" || property == "p1" || property == "point") {
         return vec3toVariant(getWorldPosition());
@@ -346,6 +348,20 @@ void Base3DOverlay::setVisible(bool visible) {
     notifyRenderVariableChange();
 }
 
+QString Base3DOverlay::getName() const {
+    return _nameLock.resultWithReadLock<QString>([&] {
+        return QString("Overlay:") + _name;
+    }
+}
+
+void Base3DOverlay::setName(QString name) {
+    _nameLock.withWriteLock([&] {
+        _name = name;
+    });
+}
+
+
+
 render::ItemKey Base3DOverlay::getKey() {
     auto builder = render::ItemKey::Builder(Overlay::getKey());
 
@@ -364,4 +380,4 @@ render::ItemKey Base3DOverlay::getKey() {
     }
 
     return builder.build();
-}
\ No newline at end of file
+}
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index d44c193055..6f6092a42e 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -29,8 +29,8 @@ public:
     virtual OverlayID getOverlayID() const override { return OverlayID(getID().toString()); }
     void setOverlayID(OverlayID overlayID) override { setID(overlayID); }
 
-    virtual QString getName() const override { return QString("Overlay:") + _name; }
-    void setName(QString name) { _name = name; }
+    virtual QString getName() const override;
+    void setName(QString name);
 
     // getters
     virtual bool is3D() const override { return true; }
@@ -107,6 +107,7 @@ protected:
     mutable bool _renderVariableDirty { true };
 
     QString _name;
+    mutable ReadWriteLockable _nameLock;
 };
 
 #endif // hifi_Base3DOverlay_h

From 5a0a259c214b4a3a4fc7dc2467f3b7d3a1935159 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 6 Sep 2018 09:37:01 -0700
Subject: [PATCH 2/3] dammit

---
 interface/src/ui/overlays/Base3DOverlay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 767afca3e7..89e6fac3dc 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -240,7 +240,7 @@ QVariant Base3DOverlay::getProperty(const QString& property) {
     if (property == "name") {
         return _nameLock.resultWithReadLock<QString>([&] {
             return _name;
-        }
+        });
     }
     if (property == "position" || property == "start" || property == "p1" || property == "point") {
         return vec3toVariant(getWorldPosition());

From 042044ceaf061aa9c4b6d7f1eed4965718f36ae3 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 6 Sep 2018 09:38:12 -0700
Subject: [PATCH 3/3] dammit

---
 interface/src/ui/overlays/Base3DOverlay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 89e6fac3dc..1d8db69e26 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -351,7 +351,7 @@ void Base3DOverlay::setVisible(bool visible) {
 QString Base3DOverlay::getName() const {
     return _nameLock.resultWithReadLock<QString>([&] {
         return QString("Overlay:") + _name;
-    }
+    });
 }
 
 void Base3DOverlay::setName(QString name) {