From cd6abadc41fb9531477724e22e79b55ff20e4be7 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 14 Jul 2016 17:37:14 -0700
Subject: [PATCH] Make sure buttons get removed when shutting down scripts

---
 scripts/system/examples.js | 1 +
 scripts/system/goto.js     | 1 +
 scripts/system/hmd.js      | 1 +
 scripts/system/mute.js     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/scripts/system/examples.js b/scripts/system/examples.js
index 0ec2644f9c..cea176f6b1 100644
--- a/scripts/system/examples.js
+++ b/scripts/system/examples.js
@@ -69,6 +69,7 @@ browseExamplesButton.clicked.connect(onClick);
 examplesWindow.visibleChanged.connect(onExamplesWindowVisibilityChanged);
 
 Script.scriptEnding.connect(function () {
+    toolBar.removeButton("examples");
     browseExamplesButton.clicked.disconnect(onClick);
     examplesWindow.visibleChanged.disconnect(onExamplesWindowVisibilityChanged);
 });
diff --git a/scripts/system/goto.js b/scripts/system/goto.js
index 24c402ab85..9cdf579d72 100644
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@@ -30,6 +30,7 @@ button.clicked.connect(onClicked);
 DialogsManager.addressBarShown.connect(onAddressBarShown);
 
 Script.scriptEnding.connect(function () {
+    toolBar.removeButton("goto");
     button.clicked.disconnect(onClicked);
     DialogsManager.addressBarShown.disconnect(onAddressBarShown);
 });
diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js
index 305557b60c..9b749c306f 100644
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@@ -40,6 +40,7 @@ if (headset) {
     HMD.displayModeChanged.connect(onHmdChanged);
     
     Script.scriptEnding.connect(function () {
+        toolBar.removeButton("hmdToggle");
         button.clicked.disconnect(onClicked);
         HMD.displayModeChanged.disconnect(onHmdChanged);
     });
diff --git a/scripts/system/mute.js b/scripts/system/mute.js
index 1a575efa01..511c013d5e 100644
--- a/scripts/system/mute.js
+++ b/scripts/system/mute.js
@@ -34,6 +34,7 @@ button.clicked.connect(onClicked);
 AudioDevice.muteToggled.connect(onMuteToggled);
 
 Script.scriptEnding.connect(function () {
+    toolBar.removeButton("mute");
     button.clicked.disconnect(onClicked);
     AudioDevice.muteToggled.disconnect(onMuteToggled);
 });