From d778b3b4ce89c826937d736775952ca5506274c7 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Thu, 27 Oct 2016 10:00:48 -0700
Subject: [PATCH] fix the timing of the launchedFromSteam property

---
 interface/src/Application.cpp | 4 +++-
 interface/src/Application.h   | 2 +-
 interface/src/main.cpp        | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fcfbe0f3b1..a2473aa3b8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -506,7 +506,7 @@ Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context);
 
 Setting::Handle<int> sessionRunTime{ "sessionRunTime", 0 };
 
-Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) :
+Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption, bool launchedFromSteam) :
     QApplication(argc, argv),
     _shouldRunServer(runServer),
     _runServerPath(runServerPathOption),
@@ -534,6 +534,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _maxOctreePPS(maxOctreePacketsPerSecond.get()),
     _lastFaceTrackerUpdate(0)
 {
+    setProperty("com.highfidelity.launchedFromSteam", launchedFromSteam);
+
     _runningMarker.startRunningMarker();
 
     PluginContainer* pluginContainer = dynamic_cast<PluginContainer*>(this); // set the container for any plugins that care
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 1a0041223e..24e4d9be34 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -139,7 +139,7 @@ public:
     static void initPlugins(const QStringList& arguments);
     static void shutdownPlugins();
 
-    Application(int& argc, char** argv, QElapsedTimer& startup_time, bool runServer, QString runServerPathOption);
+    Application(int& argc, char** argv, QElapsedTimer& startup_time, bool runServer, QString runServerPathOption, bool launchedFromSteam);
     ~Application();
 
     void postLambdaEvent(std::function<void()> f) override;
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index ab4ab689f7..59cf4647b2 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -159,10 +159,8 @@ int main(int argc, const char* argv[]) {
     int exitCode;
     {
         QSettings::setDefaultFormat(QSettings::IniFormat);
-        Application app(argc, const_cast<char**>(argv), startupTime, runServer, serverContentPathOptionValue);
-
         bool launchedFromSteam = SteamClient::isRunning();
-        app.setProperty("com.highfidelity.launchedFromSteam", launchedFromSteam);
+        Application app(argc, const_cast<char**>(argv), startupTime, runServer, serverContentPathOptionValue, launchedFromSteam);
 
         // If we failed the OpenGLVersion check, log it.
         if (override) {