summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Klinger2016-08-22 17:58:21 +0200
committerChristian Klinger2016-08-22 17:58:21 +0200
commitdf9d55031a25ea873b924b2fca7230f0f00e5ea8 (patch)
treec56b188fee2ca79c3767bc2d977f284165d867e0
parentadded a check so that lockDesktop.sh is not called too often. (diff)
downloadpvs2-df9d55031a25ea873b924b2fca7230f0f00e5ea8.tar.gz
pvs2-df9d55031a25ea873b924b2fca7230f0f00e5ea8.tar.xz
pvs2-df9d55031a25ea873b924b2fca7230f0f00e5ea8.zip
this is supposed to fix bug #2950 but doesn't.
-rw-r--r--src/client/toolbar/toolbar.cpp10
-rw-r--r--src/client/toolbar/toolbar.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index da2d336..54a5a77 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -463,10 +463,18 @@ void Toolbar::onBtnManager() {
}
void Toolbar::onBtnLockDesktop() {
+ qDebug() << "onBtnLockDesktop()";
if (this->lockDesktopP.state() == QProcess::NotRunning) {
+ _ui->btnLockDesktop->setEnabled(false);
this->lockDesktopP.start("/bin/sh", QStringList() << "/opt/openslx/pvs2/lockDesktop.sh");
- this->lockDesktopP.waitForFinished();
+
+ QTimer::singleShot(6 * 1000, this, SLOT(enableLockBtn()));
+
} else {
qDebug() << "trying to use lockDesktop-process while it is still running";
}
}
+
+void Toolbar::enableLockBtn() {
+ _ui->btnLockDesktop->setEnabled(true);
+}
diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h
index 698ac50..3b95181 100644
--- a/src/client/toolbar/toolbar.h
+++ b/src/client/toolbar/toolbar.h
@@ -75,6 +75,7 @@ private slots:
void showBar();
void hideBar();
void showAboutDialog();
+ void enableLockBtn();
};
#endif /* PVSCLIENTGUI_H_ */