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

Merge pull request #12791 from sethalves/always-use-serverless-tutorial

Browse source 
on first run, send user to serverless tutorial rather than checking for local sandbox
This commit is contained in:
John Conklin II 2018-04-05 07:28:43 -07:00 committed by GitHub
commit c8a0561e20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -3042,7 +3042,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location"; static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location";
static const QString SENT_TO_ENTRY = "entry"; static const QString SENT_TO_ENTRY = "entry";
static const QString SENT_TO_SANDBOX = "sandbox";
QString sentTo; QString sentTo;
@ -3051,15 +3050,8 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
#if !defined(Q_OS_ANDROID) #if !defined(Q_OS_ANDROID)
showHelp(); showHelp();
#endif #endif
if (sandboxIsRunning) { DependencyManager::get<AddressManager>()->goToEntry();
qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home."; sentTo = SENT_TO_ENTRY;
DependencyManager::get<AddressManager>()->goToLocalSandbox();
sentTo = SENT_TO_SANDBOX;
} else {
qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
DependencyManager::get<AddressManager>()->goToEntry();
sentTo = SENT_TO_ENTRY;
}
firstRun.set(false); firstRun.set(false);
} else { } else {