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

Merge pull request #14588 from wayne-chen/loginInitiative2

Browse source 
MS20328: New login breaks nitpick
This commit is contained in:
Jeff Clinton 2018-12-17 10:14:09 -08:00 committed by GitHub
commit a5ae4081a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -5261,7 +5261,12 @@ void Application::resumeAfterLoginDialogActionTaken() {
nodeList->getDomainHandler().resetting();
if (!accountManager->isLoggedIn()) {
addressManager->goToEntry();
if (arguments().contains("--url")) {
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()) {
@ -5274,7 +5279,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); });
}
}