Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 22:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reverting to master

Browse source
This commit is contained in:
Wayne Chen 2018-12-17 16:47:11 -08:00
parent 09ff67eab3
commit 816733b55f
1 changed files with 10 additions and 2 deletions

12
interface/src/Application.cpp
View file

@ -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); });;
}
}