From b4d3a2b79fb4d7891353330e395c12f092d536c7 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 24 Jan 2017 16:11:24 -0800 Subject: [PATCH 1/3] Fix member not being set --- libraries/plugins/src/plugins/SteamClientPlugin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/plugins/src/plugins/SteamClientPlugin.h b/libraries/plugins/src/plugins/SteamClientPlugin.h index f87ebd2e66..95e8d71d92 100644 --- a/libraries/plugins/src/plugins/SteamClientPlugin.h +++ b/libraries/plugins/src/plugins/SteamClientPlugin.h @@ -46,9 +46,9 @@ class SteamScriptingInterface : public QObject { Q_PROPERTY(bool isRunning READ isRunning) public: - SteamScriptingInterface(QObject* parent, SteamClientPlugin* plugin) : QObject(parent) {} + SteamScriptingInterface(QObject* parent, SteamClientPlugin* plugin) : QObject(parent), _plugin(plugin) {} - public slots: +public slots: bool isRunning() const { return _plugin->isRunning(); } void openInviteOverlay() const { _plugin->openInviteOverlay(); } From 808d336fe6071cc4560aa38ef171e874cf3ce665 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 24 Jan 2017 16:17:49 -0800 Subject: [PATCH 2/3] Protect again empty plugin --- libraries/plugins/src/plugins/SteamClientPlugin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/plugins/src/plugins/SteamClientPlugin.h b/libraries/plugins/src/plugins/SteamClientPlugin.h index 95e8d71d92..bcb15f31de 100644 --- a/libraries/plugins/src/plugins/SteamClientPlugin.h +++ b/libraries/plugins/src/plugins/SteamClientPlugin.h @@ -49,8 +49,8 @@ public: SteamScriptingInterface(QObject* parent, SteamClientPlugin* plugin) : QObject(parent), _plugin(plugin) {} public slots: - bool isRunning() const { return _plugin->isRunning(); } - void openInviteOverlay() const { _plugin->openInviteOverlay(); } + bool isRunning() const { return _plugin && _plugin->isRunning(); } + void openInviteOverlay() const { if (_plugin) { _plugin->openInviteOverlay(); } } private: SteamClientPlugin* _plugin; From b4400af026bb158a24831514ebb195a41f185645 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 24 Jan 2017 17:04:14 -0800 Subject: [PATCH 3/3] Rename Steam.isRunning to Steam.running --- libraries/plugins/src/plugins/SteamClientPlugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/plugins/src/plugins/SteamClientPlugin.h b/libraries/plugins/src/plugins/SteamClientPlugin.h index bcb15f31de..343ed40402 100644 --- a/libraries/plugins/src/plugins/SteamClientPlugin.h +++ b/libraries/plugins/src/plugins/SteamClientPlugin.h @@ -43,7 +43,7 @@ public: class SteamScriptingInterface : public QObject { Q_OBJECT - Q_PROPERTY(bool isRunning READ isRunning) + Q_PROPERTY(bool running READ isRunning) public: SteamScriptingInterface(QObject* parent, SteamClientPlugin* plugin) : QObject(parent), _plugin(plugin) {}