From f63c1b3fc5cd60e6cf885911e64d952b11bcae91 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Tue, 11 Dec 2018 15:42:35 -0800
Subject: [PATCH] dismiss dialog only if login dialog popped up

---
 interface/resources/qml/LoginDialog/LoggingInBody.qml         | 4 +++-
 interface/resources/qml/LoginDialog/UsernameCollisionBody.qml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml
index 63eff7132d..355f89667b 100644
--- a/interface/resources/qml/LoginDialog/LoggingInBody.qml
+++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml
@@ -62,7 +62,9 @@ Item {
         running: false;
         repeat: false;
         onTriggered: {
-            loginDialog.dismissLoginDialog();
+            if (loginDialog.getLoginDialogPoppedUp()) {
+                loginDialog.dismissLoginDialog();
+            }
             root.tryDestroy();
         }
     }
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index 90376596d8..c94543342d 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -216,7 +216,9 @@ Item {
         }
         onHandleLoginCompleted: {
             console.log("Login Succeeded");
-            loginDialog.dismissLoginDialog();
+            if (loginDialog.getLoginDialogPoppedUp()) {
+                loginDialog.dismissLoginDialog();
+            }
             root.tryDestroy();
         }