From 352a3f4ab1250814eb0970b886796d8f50a164ca Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Tue, 4 Aug 2020 21:17:57 -0400
Subject: [PATCH] Fix domain vs metaverse logins slightly.

---
 interface/src/Application.cpp       | 3 ++-
 interface/src/ui/DialogsManager.cpp | 3 +++
 interface/src/ui/DialogsManager.h   | 1 +
 interface/src/ui/LoginDialog.cpp    | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f2b708793f..4a7c788d30 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7123,13 +7123,14 @@ void Application::updateWindowTitle() const {
 
     QString domainDetails;
     if (isDomainLoggedIn) {
+        // ###### TODO
         // domainDetails = "Domain: Logged in as " + domainUsername;
         domainDetails = "Domain: Logged In";
     } else {
         domainDetails = "Domain: Not Logged In";
     }
 
-    QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + " - " + domainDetails + ")" 
+    QString title = QString() + currentPlaceName + connectionStatus + " (" + metaverseDetails + ") (" + domainDetails + ")" 
         + buildVersion;
 
 #ifndef WIN32
diff --git a/interface/src/ui/DialogsManager.cpp b/interface/src/ui/DialogsManager.cpp
index 6e807c7b9f..3aaed2d3ec 100644
--- a/interface/src/ui/DialogsManager.cpp
+++ b/interface/src/ui/DialogsManager.cpp
@@ -110,6 +110,9 @@ void DialogsManager::setDomainConnectionFailureVisibility(bool visible) {
     }
 }
 
+void DialogsManager::requestMetaverseLogin() {
+    DialogsManager::setDomainLogin(false);
+}
 
 void DialogsManager::setDomainLogin(bool isDomainLogin, const QString& domain) {
     _isDomainLogin = isDomainLogin;
diff --git a/interface/src/ui/DialogsManager.h b/interface/src/ui/DialogsManager.h
index fa5c589fb4..07d9de82b0 100644
--- a/interface/src/ui/DialogsManager.h
+++ b/interface/src/ui/DialogsManager.h
@@ -41,6 +41,7 @@ public:
     QPointer<TestingDialog> getTestingDialog() const { return _testingDialog; }
     void emitAddressBarShown(bool visible) { emit addressBarShown(visible); }
     void setAddressBarVisible(bool addressBarVisible);
+    void requestMetaverseLogin();
     bool getIsDomainLogin() { return _isDomainLogin; }
     QString getDomainLoginDomain() { return _domainLoginDomain; }
 
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 4f8a3ca2bc..46e31070b8 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -107,6 +107,8 @@ void LoginDialog::toggleAction() {
         connection = connect(loginAction, &QAction::triggered, [] {
             // if not in login state, show.
             if (!qApp->getLoginDialogPoppedUp()) {
+                auto dialogsManager = DependencyManager::get<DialogsManager>();
+                dialogsManager->requestMetaverseLogin();
                 LoginDialog::showWithSelection();
             }
         });