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

fix the timing of the launchedFromSteam property

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-10-27 10:00:48 -07:00
parent 03946748bc
commit d778b3b4ce
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -506,7 +506,7 @@ Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context);
Setting::Handle<int> sessionRunTime{ "sessionRunTime", 0 }; 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), QApplication(argc, argv),
_shouldRunServer(runServer), _shouldRunServer(runServer),
_runServerPath(runServerPathOption), _runServerPath(runServerPathOption),
@ -534,6 +534,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
_maxOctreePPS(maxOctreePacketsPerSecond.get()), _maxOctreePPS(maxOctreePacketsPerSecond.get()),
_lastFaceTrackerUpdate(0) _lastFaceTrackerUpdate(0)
{ {
setProperty("com.highfidelity.launchedFromSteam", launchedFromSteam);
_runningMarker.startRunningMarker(); _runningMarker.startRunningMarker();
PluginContainer* pluginContainer = dynamic_cast<PluginContainer*>(this); // set the container for any plugins that care PluginContainer* pluginContainer = dynamic_cast<PluginContainer*>(this); // set the container for any plugins that care

2
interface/src/Application.h
View file

@ -139,7 +139,7 @@ public:
static void initPlugins(const QStringList& arguments); static void initPlugins(const QStringList& arguments);
static void shutdownPlugins(); 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(); ~Application();
void postLambdaEvent(std::function<void()> f) override; void postLambdaEvent(std::function<void()> f) override;

4
interface/src/main.cpp
View file

@ -159,10 +159,8 @@ int main(int argc, const char* argv[]) {
int exitCode; int exitCode;
{ {
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
Application app(argc, const_cast<char**>(argv), startupTime, runServer, serverContentPathOptionValue);
bool launchedFromSteam = SteamClient::isRunning(); 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 we failed the OpenGLVersion check, log it.
if (override) { if (override) {