From b560140a2bb62fd3f65e838d9e51280776582be1 Mon Sep 17 00:00:00 2001 From: Christian Klinger Date: Mon, 22 Aug 2016 16:50:28 +0200 Subject: added a check so that lockDesktop.sh is not called too often. --- src/client/toolbar/toolbar.cpp | 10 +++++++--- src/client/toolbar/toolbar.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/client') diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index f3fab98..da2d336 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -6,6 +6,7 @@ */ #include #include +#include #include "../../shared/settings.h" #include "../net/serverconnection.h" #include "../vnc/vncwindow.h" @@ -462,7 +463,10 @@ void Toolbar::onBtnManager() { } void Toolbar::onBtnLockDesktop() { - QProcess lockP; - lockP.start("/bin/sh", QStringList() << "/opt/openslx/pvs2/lockDesktop.sh"); - lockP.waitForFinished(); + if (this->lockDesktopP.state() == QProcess::NotRunning) { + this->lockDesktopP.start("/bin/sh", QStringList() << "/opt/openslx/pvs2/lockDesktop.sh"); + this->lockDesktopP.waitForFinished(); + } else { + qDebug() << "trying to use lockDesktop-process while it is still running"; + } } diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h index 0e118bf..698ac50 100644 --- a/src/client/toolbar/toolbar.h +++ b/src/client/toolbar/toolbar.h @@ -61,6 +61,8 @@ private: void init(); void initMenu(); + QProcess lockDesktopP; + private slots: void onVncServerIsRunning(int port); void onDisconnected(); -- cgit v1.2.3-55-g7522