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

Update initial run logic

Browse source
This commit is contained in:
Ryan Huffman 2016-10-03 13:24:19 -07:00
parent 92a7a638d4
commit 9ddeda389e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/Application.cpp
View file

@ -1283,10 +1283,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
bool shouldGoToTutorial = hasHMDAndHandControllers && hasTutorialContent && !tutorialComplete.get(); bool shouldGoToTutorial = hasHMDAndHandControllers && hasTutorialContent && !tutorialComplete.get();
qDebug() << "Has HMD + Hand Controllers: " << hasHMDAndHandControllers << ", current plugin: " << _displayPlugin->getName(); qDebug() << "Has HMD + Hand Controllers: " << hasHMDAndHandControllers << ", current plugin: " << _displayPlugin->getName();
qDebug() << "has tutorial content" << hasTutorialContent; qDebug() << "Has tutorial content: " << hasTutorialContent;
qDebug() << "tutorial complete" << tutorialComplete.get(); qDebug() << "Tutorial complete: " << tutorialComplete.get();
qDebug() << "should go to tutorial " << shouldGoToTutorial; qDebug() << "Should go to tutorial: " << shouldGoToTutorial;
// when --url in command line, teleport to location // when --url in command line, teleport to location
const QString HIFI_URL_COMMAND_LINE_KEY = "--url"; const QString HIFI_URL_COMMAND_LINE_KEY = "--url";
@ -1315,11 +1314,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
}); });
} else { } else {
if (firstRun.get()) { bool isFirstRun = firstRun.get();
if (isFirstRun) {
showHelp(); showHelp();
} }
if (addressLookupString.isEmpty() && firstRun.get()) { // If this is a first run we short-circuit the address passed in
if (isFirstRun) {
if (hasHMDAndHandControllers) { if (hasHMDAndHandControllers) {
DependencyManager::get<AddressManager>()->ifLocalSandboxRunningElse([=]() { DependencyManager::get<AddressManager>()->ifLocalSandboxRunningElse([=]() {
qDebug() << "Home sandbox appears to be running, going to Home."; qDebug() << "Home sandbox appears to be running, going to Home.";