Stop screenshare process on interface shutdown

This commit is contained in:
Zach Fox 2019-10-31 10:01:00 -07:00
parent d8026304a4
commit 47b3fdbfe3
3 changed files with 6 additions and 1 deletions

View file

@ -2938,6 +2938,7 @@ Application::~Application() {
DependencyManager::destroy<SoundCache>();
DependencyManager::destroy<OctreeStatsProvider>();
DependencyManager::destroy<GeometryCache>();
DependencyManager::destroy<ScreenshareScriptingInterface>();
DependencyManager::get<ResourceManager>()->cleanup();

View file

@ -17,9 +17,12 @@
ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
};
ScreenshareScriptingInterface::~ScreenshareScriptingInterface() {
stopScreenshare();
}
void ScreenshareScriptingInterface::startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey) {
if (QThread::currentThread() != thread()) {
// We must start a new QProcess from the main thread.

View file

@ -11,6 +11,7 @@ class ScreenshareScriptingInterface : public QObject, public Dependency {
Q_OBJECT
public:
ScreenshareScriptingInterface();
~ScreenshareScriptingInterface();
Q_INVOKABLE void startScreenshare(QString displayName, QString userName, QString token, QString sessionID, QString apiKey);
Q_INVOKABLE void stopScreenshare();