From 80896537841b860058de4c941ffd6e41992da061 Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Fri, 4 Oct 2019 09:43:47 -0700
Subject: [PATCH] CR Feedback changes

---
 scripts/simplifiedUI/ui/simplifiedUI.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index c1a2c37d9c..c35c08fcee 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -370,10 +370,6 @@ var INITIAL_WINDOW_FLAGS = 0x00000001 | // Qt::Window
 var initialLaunchWindow = false;
 function displayInitialLaunchWindow() {
     if (initialLaunchWindow) {
-        initialLaunchWindow.close();
-        // This really shouldn't be necessary.
-        // This signal really should automatically be called by the signal handler set up below.
-        // But fixing that requires an engine change, so this workaround will do.
         return;
     }
 
@@ -407,10 +403,6 @@ var SECOND_WINDOW_FLAGS = 0x00000001 | // Qt::Window
 var secondLaunchWindow = false;
 function displaySecondLaunchWindow() {
     if (secondLaunchWindow) {
-        secondLaunchWindow.close();
-        // This really shouldn't be necessary.
-        // This signal really should automatically be called by the signal handler set up below.
-        // But fixing that requires an engine change, so this workaround will do.
         return;
     }
 
@@ -847,6 +839,10 @@ function shutdown() {
         closeInitialLaunchWindow();
     }
 
+    if (secondLaunchWindow) {
+        closesecondLaunchWindow();
+    }
+
     maybeDeleteInputDeviceMutedOverlay();
     maybeDeleteOutputDeviceMutedOverlay();