From 8a7f67c8497780c6309e142ae63e23ccaeb6fd62 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 27 Oct 2016 15:01:11 -0700
Subject: [PATCH] Cleanup client controller display implementation in tutorial

---
 tutorial/tutorial.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js
index 361d345011..7b258611c7 100644
--- a/tutorial/tutorial.js
+++ b/tutorial/tutorial.js
@@ -250,10 +250,10 @@ var stepDisableControllers = function(name) {
 }
 stepDisableControllers.prototype = {
     start: function(onFinish) {
-        HMD.requestShowHandControllers();
-
         disableEverything();
 
+        HMD.requestShowHandControllers();
+
         onFinish();
     },
     cleanup: function() {
@@ -276,8 +276,6 @@ function disableEverything() {
 
     hideEntitiesWithTag('finish');
 
-    controllerDisplayManager = new ControllerDisplayManager();
-
     setAwayEnabled(false);
 }
 
@@ -295,7 +293,6 @@ function reenableEverything() {
     setControllerPartLayer('touchpad', 'blank');
     setControllerPartLayer('tips', 'blank');
     MyAvatar.shouldRenderLocally = true;
-    HMD.requestHideHandControllers();
     setAwayEnabled(true);
 }
 
@@ -313,6 +310,7 @@ var stepEnableControllers = function(name) {
 stepEnableControllers.prototype = {
     start: function(onFinish) {
         reenableEverything();
+        HMD.requestHideHandControllers();
         onFinish();
     },
     cleanup: function() {
@@ -1099,6 +1097,7 @@ TutorialManager = function() {
     this.stopTutorial = function() {
         if (currentStep) {
             currentStep.cleanup();
+            HMD.requestHideHandControllers();
         }
         reenableEverything();
         currentStepNum = -1;