From 1001097f9293197273a45aad423170a5bf29cf1e Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 11 Jul 2017 15:29:00 -0700
Subject: [PATCH] Fix button state

---
 scripts/system/spectatorCamera.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/system/spectatorCamera.js b/scripts/system/spectatorCamera.js
index 94e3dbde02..8945d006ab 100644
--- a/scripts/system/spectatorCamera.js
+++ b/scripts/system/spectatorCamera.js
@@ -113,6 +113,14 @@
     //    destroy the camera entity. "isChangingDomains" is true when this function is called
     //    from the "Window.domainChanged()" signal.
     function spectatorCameraOff(isChangingDomains) {
+
+        function deleteCamera() {
+            Entities.deleteEntity(camera);
+            camera = false;
+            // Change button to active when window is first openend OR if the camera is on, false otherwise.
+            button.editProperties({ isActive: onSpectatorCameraScreen || camera });
+        }
+
         spectatorCameraConfig.attachedEntityId = false;
         spectatorCameraConfig.enableSecondaryCameraRenderConfigs(false);
         if (camera) {
@@ -121,12 +129,10 @@
             // Should be removed after FB6155 is fixed.
             if (isChangingDomains) {
                 Script.setTimeout(function () {
-                    Entities.deleteEntity(camera);
-                    camera = false;
+                    deleteCamera();
                 }, 1 * 1000);
             } else {
-                Entities.deleteEntity(camera);
-                camera = false;
+                deleteCamera();
             }
         }
         if (viewFinderOverlay) {
@@ -134,10 +140,6 @@
         }
         viewFinderOverlay = false;
         setDisplay(monitorShowsCameraView);
-        // Change button to active when window is first openend OR if the camera is on, false otherwise.
-        if (button) {
-            button.editProperties({ isActive: onSpectatorCameraScreen || camera });
-        }
     }
 
     // Function Name: addOrRemoveButton()