From f95a731249a58bb9f0914fc0bcfc818cb8f5e8f3 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 26 Oct 2016 13:22:03 -0700 Subject: [PATCH 1/3] add app property when the app was launched from steam --- interface/src/main.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 5b0da4f578..afde066108 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -127,13 +127,17 @@ int main(int argc, const char* argv[]) { QCommandLineParser parser; QCommandLineOption runServerOption("runServer", "Whether to run the server"); QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath"); + QCommandLineOption launchedFromSteamOption("launchedFromSteam", "Whether we were launched from SteamVR."); parser.addOption(runServerOption); parser.addOption(serverContentPathOption); + parser.addOption(launchedFromSteamOption); parser.parse(arguments); bool runServer = parser.isSet(runServerOption); bool serverContentPathOptionIsSet = parser.isSet(serverContentPathOption); QString serverContentPathOptionValue = serverContentPathOptionIsSet ? parser.value(serverContentPathOption) : QString(); + bool launchedFromSteam = parser.isSet(launchedFromSteamOption); + QElapsedTimer startupTime; startupTime.start(); @@ -161,6 +165,9 @@ int main(int argc, const char* argv[]) { QSettings::setDefaultFormat(QSettings::IniFormat); Application app(argc, const_cast(argv), startupTime, runServer, serverContentPathOptionValue); + QVariant launchedFromSteamVariant(launchedFromSteam); + app.setProperty("com.highfidelity.launchedFromSteam", launchedFromSteamVariant); + // If we failed the OpenGLVersion check, log it. if (override) { auto accountManager = DependencyManager::get(); From 5f2b4c2a7f24111980b819a7252b0b64d8502ea6 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 26 Oct 2016 13:27:11 -0700 Subject: [PATCH 2/3] CR feedback --- interface/src/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index afde066108..78cec16237 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -165,8 +165,7 @@ int main(int argc, const char* argv[]) { QSettings::setDefaultFormat(QSettings::IniFormat); Application app(argc, const_cast(argv), startupTime, runServer, serverContentPathOptionValue); - QVariant launchedFromSteamVariant(launchedFromSteam); - app.setProperty("com.highfidelity.launchedFromSteam", launchedFromSteamVariant); + app.setProperty("com.highfidelity.launchedFromSteam", launchedFromSteam); // If we failed the OpenGLVersion check, log it. if (override) { From e464858c4c4034cd6f5f7f78df414e18d62443f1 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 26 Oct 2016 14:08:18 -0700 Subject: [PATCH 3/3] use SteamClient::isRunning() instead of command line param --- interface/src/main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 78cec16237..ab4ab689f7 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -127,17 +127,13 @@ int main(int argc, const char* argv[]) { QCommandLineParser parser; QCommandLineOption runServerOption("runServer", "Whether to run the server"); QCommandLineOption serverContentPathOption("serverContentPath", "Where to find server content", "serverContentPath"); - QCommandLineOption launchedFromSteamOption("launchedFromSteam", "Whether we were launched from SteamVR."); parser.addOption(runServerOption); parser.addOption(serverContentPathOption); - parser.addOption(launchedFromSteamOption); parser.parse(arguments); bool runServer = parser.isSet(runServerOption); bool serverContentPathOptionIsSet = parser.isSet(serverContentPathOption); QString serverContentPathOptionValue = serverContentPathOptionIsSet ? parser.value(serverContentPathOption) : QString(); - bool launchedFromSteam = parser.isSet(launchedFromSteamOption); - QElapsedTimer startupTime; startupTime.start(); @@ -165,6 +161,7 @@ int main(int argc, const char* argv[]) { QSettings::setDefaultFormat(QSettings::IniFormat); Application app(argc, const_cast(argv), startupTime, runServer, serverContentPathOptionValue); + bool launchedFromSteam = SteamClient::isRunning(); app.setProperty("com.highfidelity.launchedFromSteam", launchedFromSteam); // If we failed the OpenGLVersion check, log it.