Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -5272,12 +5272,7 @@ void Application::resumeAfterLoginDialogActionTaken() { · 5271 unmodified lines | |||
| 5272 | nodeList->getDomainHandler().resetting(); | 5272 | nodeList->getDomainHandler().resetting(); |
| 5273 | 5273 | ||
| 5274 | if (!accountManager->isLoggedIn()) { | 5274 | if (!accountManager->isLoggedIn()) { |
| 5275 | if (arguments().contains("--url")) { | 5275 | addressManager->goToEntry(); |
| 5276 | auto reply = SandboxUtils::getStatus(); | ||
| 5277 | connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); }); | ||
| 5278 | } else { | ||
| 5279 | addressManager->goToEntry(); | ||
| 5280 | } | ||
| 5281 | } else { | 5276 | } else { |
| 5282 | QVariant testProperty = property(hifi::properties::TEST); | 5277 | QVariant testProperty = property(hifi::properties::TEST); |
| 5283 | if (testProperty.isValid()) { | 5278 | if (testProperty.isValid()) { |
| @@ -5290,8 +5285,7 @@ void Application::resumeAfterLoginDialogActionTaken() { · 6 unmodified lines | |||
| 5290 | connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); }); | 5285 | connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); }); |
| 5291 | } | 5286 | } |
| 5292 | } else { | 5287 | } else { |
| 5293 | auto reply = SandboxUtils::getStatus(); | 5288 | addressManager->loadSettings(); |
| 5294 | connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); }); | ||
| 5295 | } | 5289 | } |
| 5296 | } | 5290 | } |
| 5297 | 5291 | ||