From ab02fd79a0dc2541a5a1da2264d454bccd558421 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Thu, 20 Oct 2016 10:12:26 -0700 Subject: [PATCH] since we know the state, use that boolean --- interface/src/Application.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2d3f7cecc7..11e4f83dc6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1328,10 +1328,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo const QString TUTORIAL_PATH = "/tutorial_begin"; if (shouldGoToTutorial) { - sandboxUtils.ifLocalSandboxRunningElse([=]() { + if(determinedSandboxState) { qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home."; DependencyManager::get()->goToLocalSandbox(TUTORIAL_PATH); - }, [=]() { + } else { qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry."; if (firstRun.get()) { showHelp(); @@ -1341,7 +1341,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo } else { DependencyManager::get()->loadSettings(addressLookupString); } - }); + } } else { 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 (isFirstRun) { if (hasHMDAndHandControllers) { - sandboxUtils.ifLocalSandboxRunningElse([=]() { + if(determinedSandboxState) { qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home."; DependencyManager::get()->goToLocalSandbox(); - }, [=]() { + } else { qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry."; DependencyManager::get()->goToEntry(); - }); + } } else { DependencyManager::get()->goToEntry(); }