mirror of
https://github.com/overte-org/overte.git
synced 2025-04-17 05:30:41 +02:00
matching master
This commit is contained in:
parent
28fd1380df
commit
5d89ed2a81
1 changed files with 2 additions and 8 deletions
|
@ -5272,12 +5272,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
|
|||
nodeList->getDomainHandler().resetting();
|
||||
|
||||
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 {
|
||||
QVariant testProperty = property(hifi::properties::TEST);
|
||||
if (testProperty.isValid()) {
|
||||
|
@ -5290,8 +5285,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
|
|||
connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
|
||||
}
|
||||
} else {
|
||||
auto reply = SandboxUtils::getStatus();
|
||||
connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
|
||||
addressManager->loadSettings();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue