From 1939c6915aee67d19b85701915d0aec8dee1a25d Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Wed, 24 Aug 2016 10:05:27 -0700
Subject: [PATCH] Bug-fixes for marketplace toggling

---
 scripts/system/marketplace.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/system/marketplace.js b/scripts/system/marketplace.js
index cb82ab9060..11b5a084cf 100644
--- a/scripts/system/marketplace.js
+++ b/scripts/system/marketplace.js
@@ -55,7 +55,7 @@ function hideMarketplace() {
     if (marketplaceWindow.visible) {
         marketplaceWindow.setVisible(false);
         marketplaceWindow.setURL("about:blank");
-    } else {
+    } else if (marketplaceWebTablet) {
         marketplaceWebTablet.destroy();
         marketplaceWebTablet = null;
     }
@@ -81,16 +81,19 @@ var browseExamplesButton = toolBar.addButton({
     alpha: 0.9
 });
 
-function onExamplesWindowVisibilityChanged() {
+function onMarketplaceWindowVisibilityChanged() {
     browseExamplesButton.writeProperty('buttonState', marketplaceWindow.visible ? 0 : 1);
     browseExamplesButton.writeProperty('defaultState', marketplaceWindow.visible ? 0 : 1);
     browseExamplesButton.writeProperty('hoverState', marketplaceWindow.visible ? 2 : 3);
+    marketplaceVisible = marketplaceWindow.visible;
 }
+
 function onClick() {
     toggleMarketplace();
 }
+
 browseExamplesButton.clicked.connect(onClick);
-marketplaceWindow.visibleChanged.connect(onExamplesWindowVisibilityChanged);
+marketplaceWindow.visibleChanged.connect(onMarketplaceWindowVisibilityChanged);
 
 Script.scriptEnding.connect(function () {
     toolBar.removeButton("marketplace");