From 9ddeda389ee1d123e5bb411d29215125e9f4f238 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 3 Oct 2016 13:24:19 -0700
Subject: [PATCH] Update initial run logic
---
interface/src/Application.cpp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 45c14b2f88..f5b78ce8ca 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1283,10 +1283,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
bool shouldGoToTutorial = hasHMDAndHandControllers && hasTutorialContent && !tutorialComplete.get();
qDebug() << "Has HMD + Hand Controllers: " << hasHMDAndHandControllers << ", current plugin: " << _displayPlugin->getName();
- qDebug() << "has tutorial content" << hasTutorialContent;
- qDebug() << "tutorial complete" << tutorialComplete.get();
- qDebug() << "should go to tutorial " << shouldGoToTutorial;
-
+ qDebug() << "Has tutorial content: " << hasTutorialContent;
+ qDebug() << "Tutorial complete: " << tutorialComplete.get();
+ qDebug() << "Should go to tutorial: " << shouldGoToTutorial;
// when --url in command line, teleport to location
const QString HIFI_URL_COMMAND_LINE_KEY = "--url";
@@ -1315,11 +1314,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
});
} else {
- if (firstRun.get()) {
+ bool isFirstRun = firstRun.get();
+
+ if (isFirstRun) {
showHelp();
}
- if (addressLookupString.isEmpty() && firstRun.get()) {
+ // If this is a first run we short-circuit the address passed in
+ if (isFirstRun) {
if (hasHMDAndHandControllers) {
DependencyManager::get<AddressManager>()->ifLocalSandboxRunningElse([=]() {
qDebug() << "Home sandbox appears to be running, going to Home.";