From c8071e81b19e075fe93a8bbd675ad349f5b6c317 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Tue, 6 Nov 2018 13:32:31 -0800
Subject: [PATCH] sending user to saved address if logged in

---
 interface/resources/qml/LoginDialog/LoggingInBody.qml |  2 +-
 interface/src/Application.cpp                         | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml
index ea3f7e90c6..e94a450f96 100644
--- a/interface/resources/qml/LoginDialog/LoggingInBody.qml
+++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml
@@ -59,6 +59,7 @@ Item {
         running: false;
         repeat: false;
         onTriggered: {
+            loginDialog.dismissLoginDialog();
             root.tryDestroy();
         }
     }
@@ -102,7 +103,6 @@ Item {
             loggingInText.text = "You are now logged in!";
         }
         successTimer.start();
-        loginDialog.dismissLoginDialog();
     }
 
     Item {
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 49ece45012..82bb320dae 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5231,13 +5231,9 @@ void Application::pauseUntilLoginDetermined() {
     nodeList->getDomainHandler().disconnect();
     auto menu = Menu::getInstance();
     menu->getMenu("Edit")->setVisible(false);
-    menu->getMenu("Edit")->setEnabled(false);
     menu->getMenu("View")->setVisible(false);
-    menu->getMenu("View")->setEnabled(false);
     menu->getMenu("Navigate")->setVisible(false);
-    menu->getMenu("Navigate")->setEnabled(false);
     menu->getMenu("Settings")->setVisible(false);
-    menu->getMenu("Settings")->setEnabled(false);
 }
 
 void Application::resumeAfterLoginDialogActionTaken() {
@@ -5273,6 +5269,8 @@ void Application::resumeAfterLoginDialogActionTaken() {
     auto addressManager = DependencyManager::get<AddressManager>();
     if (!accountManager->isLoggedIn()) {
         addressManager->goToEntry();
+    } else {
+        addressManager->loadSettings();
     }
 
     const auto& nodeList = DependencyManager::get<NodeList>();
@@ -5282,13 +5280,9 @@ void Application::resumeAfterLoginDialogActionTaken() {
 
     auto menu = Menu::getInstance();
     menu->getMenu("Edit")->setVisible(true);
-    menu->getMenu("Edit")->setEnabled(true);
     menu->getMenu("View")->setVisible(true);
-    menu->getMenu("View")->setEnabled(true);
     menu->getMenu("Navigate")->setVisible(true);
-    menu->getMenu("Navigate")->setEnabled(true);
     menu->getMenu("Settings")->setVisible(true);
-    menu->getMenu("Settings")->setEnabled(true);
 }
 
 void Application::loadAvatarScripts(const QVector<QString>& urls) {