Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:21:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

since we know the state, use that boolean

Browse source
This commit is contained in:
David Kelly 2016-10-20 10:12:26 -07:00
parent 5b7f0cb358
commit ab02fd79a0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -1328,10 +1328,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
const QString TUTORIAL_PATH = "/tutorial_begin"; const QString TUTORIAL_PATH = "/tutorial_begin";
if (shouldGoToTutorial) { if (shouldGoToTutorial) {
sandboxUtils.ifLocalSandboxRunningElse([=]() { if(determinedSandboxState) {
qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home."; qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
DependencyManager::get<AddressManager>()->goToLocalSandbox(TUTORIAL_PATH); DependencyManager::get<AddressManager>()->goToLocalSandbox(TUTORIAL_PATH);
}, [=]() { } else {
qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry."; qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
if (firstRun.get()) { if (firstRun.get()) {
showHelp(); showHelp();
@ -1341,7 +1341,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
} else { } else {
DependencyManager::get<AddressManager>()->loadSettings(addressLookupString); DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
} }
}); }
} else { } else {
bool isFirstRun = firstRun.get(); bool isFirstRun = firstRun.get();
@ -1353,13 +1353,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
// If this is a first run we short-circuit the address passed in // If this is a first run we short-circuit the address passed in
if (isFirstRun) { if (isFirstRun) {
if (hasHMDAndHandControllers) { if (hasHMDAndHandControllers) {
sandboxUtils.ifLocalSandboxRunningElse([=]() { if(determinedSandboxState) {
qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home."; qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
DependencyManager::get<AddressManager>()->goToLocalSandbox(); DependencyManager::get<AddressManager>()->goToLocalSandbox();
}, [=]() { } else {
qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry."; qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
DependencyManager::get<AddressManager>()->goToEntry(); DependencyManager::get<AddressManager>()->goToEntry();
}); }
} else { } else {
DependencyManager::get<AddressManager>()->goToEntry(); DependencyManager::get<AddressManager>()->goToEntry();
} }