From 8228afb3782c2b11cfd3d7ee72c243e1c7ac86eb Mon Sep 17 00:00:00 2001
From: Alexia Mandeville <alexia@HIGHFIDELITY.IO>
Date: Wed, 27 Jun 2018 17:15:54 -0700
Subject: [PATCH] Resolving issue where VR input for movement stops emotes

---
 scripts/system/emote.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/system/emote.js b/scripts/system/emote.js
index 1c741ba129..d484078b7b 100644
--- a/scripts/system/emote.js
+++ b/scripts/system/emote.js
@@ -84,7 +84,7 @@ function onWebEventReceived(event) {
             emoteName = event.data + randSit; // Sit1, Sit2, Sit3
         }
         
-        if (ANIMATIONS[emoteName].resource.state =+= FINISHED) {
+        if (ANIMATIONS[emoteName].resource.state === FINISHED) {
             
             if (activeTimer !== false) {
                 Script.clearTimeout(activeTimer);
@@ -101,6 +101,7 @@ function onWebEventReceived(event) {
                 
                     // If user provides input during a sit, the avatar animation state should be restored
                     Controller.keyPressEvent.connect(restoreAnimation);
+                    Controller.enableMapping(eventMappingName);
                     MyAvatar.overrideAnimation(ANIMATIONS[emoteName].url, FPS, false, 0, frameCount);
                 
                 } else {
@@ -132,6 +133,7 @@ function restoreAnimation() {
     
     // Make sure the input is disconnected after animations are restored so it doesn't affect any emotes other than sit
     Controller.keyPressEvent.disconnect(restoreAnimation);
+    Controller.disableMapping(eventMappingName);
 }
                     
 // Note peek() so as to not interfere with other mappings.
@@ -151,7 +153,7 @@ eventMapping.from(Controller.Standard.RS).peek().to(restoreAnimation);
 eventMapping.from(Controller.Standard.RightGrip).peek().to(restoreAnimation);
 eventMapping.from(Controller.Standard.Back).peek().to(restoreAnimation);
 eventMapping.from(Controller.Standard.Start).peek().to(restoreAnimation);
-Controller.enableMapping(eventMappingName);
+
 
 button.clicked.connect(onClicked);
 tablet.screenChanged.connect(onScreenChanged);