From 11b461a73033867d00763d4c60f7532adae0aba4 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Tue, 19 Jul 2016 01:46:29 +0200
Subject: [PATCH 1/2] Fixes duplicate target overlays for teleporter, make sure
 to delete overlay before creating one

---
 scripts/system/controllers/teleport.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index da0b4cb576..854e23315e 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -88,6 +88,7 @@ function Teleporter() {
 
     this.createTargetOverlay = function() {
 
+        _this.deleteTargetOverlay();
         var targetOverlayProps = {
             url: TARGET_MODEL_URL,
             dimensions: TARGET_MODEL_DIMENSIONS,
@@ -191,6 +192,9 @@ function Teleporter() {
     };
 
     this.deleteTargetOverlay = function() {
+        if (this.targetOverlay === null) {
+            return;
+        }
         Overlays.deleteOverlay(this.targetOverlay);
         this.intersection = null;
         this.targetOverlay = null;

From 2adff24a058ab596bae5b427d55b03e72caaf99e Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Tue, 19 Jul 2016 21:34:42 +0200
Subject: [PATCH 2/2] silly workaround- workaround

---
 scripts/system/controllers/teleport.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js
index 854e23315e..3d40bfb9eb 100644
--- a/scripts/system/controllers/teleport.js
+++ b/scripts/system/controllers/teleport.js
@@ -88,11 +88,13 @@ function Teleporter() {
 
     this.createTargetOverlay = function() {
 
-        _this.deleteTargetOverlay();
+        if (_this.targetOverlay !== null) {
+            return;
+        }
         var targetOverlayProps = {
             url: TARGET_MODEL_URL,
             dimensions: TARGET_MODEL_DIMENSIONS,
-            visible: true,
+            visible: true
         };
 
         _this.targetOverlay = Overlays.addOverlay("model", targetOverlayProps);
@@ -620,4 +622,4 @@ function cleanup() {
     if (teleporter.updateConnected !== null) {
         Script.update.disconnect(teleporter.update);
     }
-}
\ No newline at end of file
+}