From 816733b55fe48fbc79e4d4e5e112aadc657ac090 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Mon, 17 Dec 2018 16:47:11 -0800
Subject: [PATCH] reverting to master

---
 interface/src/Application.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7663f51fbd..447770b608 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5272,7 +5272,14 @@ void Application::resumeAfterLoginDialogActionTaken() {
     nodeList->getDomainHandler().resetting();
 
     if (!accountManager->isLoggedIn()) {
-        addressManager->goToEntry();
+        if (arguments().contains("--url")) {
+            addressManager->goToEntry();
+            auto reply = SandboxUtils::getStatus();
+            connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
+        }
+        else {
+            addressManager->goToEntry();
+        }
     } else {
         QVariant testProperty = property(hifi::properties::TEST);
         if (testProperty.isValid()) {
@@ -5285,7 +5292,8 @@ void Application::resumeAfterLoginDialogActionTaken() {
                 connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
             }
         } else {
-            addressManager->loadSettings();
+            auto reply = SandboxUtils::getStatus();
+            connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });;
         }
     }