From f535bd2a76cb4ce55fa2288722fb6ab4f8392032 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 15 May 2015 13:54:24 -0700
Subject: [PATCH 1/4] more fixes to pointer.js

---
 examples/pointer.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/pointer.js b/examples/pointer.js
index d4348e19aa..c41bf277dd 100644
--- a/examples/pointer.js
+++ b/examples/pointer.js
@@ -17,6 +17,7 @@ function removeLine() {
         Entities.deleteEntity(lineEntityID);
         lineEntityID = null;
         lineIsRezzed = false;
+        Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
     }
 }
 
@@ -43,6 +44,7 @@ function createOrUpdateLine(event) {
                 color: { red: 255, green: 255, blue: 255 },
                 lifetime: 60 // if someone crashes while pointing, don't leave the line there forever.
             });
+            Controller.mouseMoveEvent.connect(mouseMoveEvent);
         }
     } else {
         removeLine();
@@ -58,9 +60,6 @@ function mousePressEvent(event) {
         return;
     }
     createOrUpdateLine(event);
-    if (lineIsRezzed) {
-        Controller.mouseMoveEvent.connect(mouseMoveEvent);
-    }
  }
 
 
@@ -70,9 +69,6 @@ function mouseMoveEvent(event) {
 
 
 function mouseReleaseEvent() {
-    if (lineIsRezzed) {
-        Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
-    }
     removeLine();
 }
 

From aeb5cead65f19d38b73e456f905821281f5cb146 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 15 May 2015 14:02:25 -0700
Subject: [PATCH 2/4] more fixes to pointer.js

---
 examples/pointer.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/pointer.js b/examples/pointer.js
index c41bf277dd..ef35e13f7b 100644
--- a/examples/pointer.js
+++ b/examples/pointer.js
@@ -17,7 +17,6 @@ function removeLine() {
         Entities.deleteEntity(lineEntityID);
         lineEntityID = null;
         lineIsRezzed = false;
-        Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
     }
 }
 
@@ -44,7 +43,6 @@ function createOrUpdateLine(event) {
                 color: { red: 255, green: 255, blue: 255 },
                 lifetime: 60 // if someone crashes while pointing, don't leave the line there forever.
             });
-            Controller.mouseMoveEvent.connect(mouseMoveEvent);
         }
     } else {
         removeLine();
@@ -56,9 +54,7 @@ function mousePressEvent(event) {
     if (!event.isLeftButton) {
         return;
     }
-    if (lineIsRezzed) {
-        return;
-    }
+    Controller.mouseMoveEvent.connect(mouseMoveEvent);
     createOrUpdateLine(event);
  }
 
@@ -69,6 +65,7 @@ function mouseMoveEvent(event) {
 
 
 function mouseReleaseEvent() {
+    Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
     removeLine();
 }
 

From 0d3add85968ec0ee90512ce28bfa32253723df53 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 15 May 2015 14:16:06 -0700
Subject: [PATCH 3/4] left mouse button only

---
 examples/pointer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/pointer.js b/examples/pointer.js
index ef35e13f7b..6c26a28ed8 100644
--- a/examples/pointer.js
+++ b/examples/pointer.js
@@ -64,7 +64,10 @@ function mouseMoveEvent(event) {
 }
 
 
-function mouseReleaseEvent() {
+function mouseReleaseEvent(event) {
+    if (!event.isLeftButton) {
+        return;
+    }
     Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
     removeLine();
 }

From 60bd345e577ec94035fb744974462e84066f58d8 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 15 May 2015 14:20:29 -0700
Subject: [PATCH 4/4] shorter timeout

---
 examples/pointer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/pointer.js b/examples/pointer.js
index 6c26a28ed8..dfb79569f7 100644
--- a/examples/pointer.js
+++ b/examples/pointer.js
@@ -32,7 +32,7 @@ function createOrUpdateLine(event) {
             Entities.editEntity(lineEntityID, {
                 position: nearLinePoint(intersection.intersection),
                 dimensions: dim,
-                lifetime: 60 + props.lifespan // renew lifetime
+                lifetime: 15 + props.lifespan // renew lifetime
             });
         } else {
             lineIsRezzed = true;
@@ -41,7 +41,7 @@ function createOrUpdateLine(event) {
                 position: nearLinePoint(intersection.intersection),
                 dimensions: dim,
                 color: { red: 255, green: 255, blue: 255 },
-                lifetime: 60 // if someone crashes while pointing, don't leave the line there forever.
+                lifetime: 15 // if someone crashes while pointing, don't leave the line there forever.
             });
         }
     } else {