From c6d89f181a061e228c6c1d9c38d0b795c5916087 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Thu, 27 Oct 2016 10:08:16 -0700 Subject: [PATCH] CR feedback --- interface/src/Application.cpp | 4 ++-- interface/src/Application.h | 2 +- interface/src/main.cpp | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a2473aa3b8..a32f50f25c 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 sessionRunTime{ "sessionRunTime", 0 }; -Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption, bool launchedFromSteam) : +Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bool runServer, QString runServerPathOption) : QApplication(argc, argv), _shouldRunServer(runServer), _runServerPath(runServerPathOption), @@ -534,7 +534,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo _maxOctreePPS(maxOctreePacketsPerSecond.get()), _lastFaceTrackerUpdate(0) { - setProperty("com.highfidelity.launchedFromSteam", launchedFromSteam); + setProperty("com.highfidelity.launchedFromSteam", SteamClient::isRunning()); _runningMarker.startRunningMarker(); diff --git a/interface/src/Application.h b/interface/src/Application.h index 24e4d9be34..1a0041223e 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, bool launchedFromSteam); + Application(int& argc, char** argv, QElapsedTimer& startup_time, bool runServer, QString runServerPathOption); ~Application(); void postLambdaEvent(std::function f) override; diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 59cf4647b2..5b0da4f578 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -159,8 +159,7 @@ int main(int argc, const char* argv[]) { int exitCode; { QSettings::setDefaultFormat(QSettings::IniFormat); - bool launchedFromSteam = SteamClient::isRunning(); - Application app(argc, const_cast(argv), startupTime, runServer, serverContentPathOptionValue, launchedFromSteam); + Application app(argc, const_cast(argv), startupTime, runServer, serverContentPathOptionValue); // If we failed the OpenGLVersion check, log it. if (override) {