Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 16:41:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

matching master

Browse source
This commit is contained in:
Wayne Chen 2018-12-17 13:46:55 -08:00
parent 28fd1380df
commit 5d89ed2a81
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -5272,12 +5272,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
nodeList->getDomainHandler().resetting(); nodeList->getDomainHandler().resetting();
if (!accountManager->isLoggedIn()) { if (!accountManager->isLoggedIn()) {
if (arguments().contains("--url")) {
auto reply = SandboxUtils::getStatus();
connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
} else {
addressManager->goToEntry(); addressManager->goToEntry();
}
} else { } else {
QVariant testProperty = property(hifi::properties::TEST); QVariant testProperty = property(hifi::properties::TEST);
if (testProperty.isValid()) { if (testProperty.isValid()) {
@ -5290,8 +5285,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); }); connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
} }
} else { } else {
auto reply = SandboxUtils::getStatus(); addressManager->loadSettings();
connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
} }
} }