From a8a33a1b3a5ca17931da5aca626ebfcabec5ce77 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 11 Oct 2016 18:49:36 +0200
Subject: [client] Disable lock button for just two seconds; ignore clicks on
 invisible "switch to manager" button

---
 src/client/toolbar/toolbar.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/client/toolbar/toolbar.cpp')

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 13e5cfb..2059067 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -114,8 +114,11 @@ void Toolbar::init()
 
 	/* setup manager button */
 	_isManagerPc = isManagerPc();
-	_ui->btnManager->setVisible(_isManagerPc);
-	connect(_ui->btnManager, SIGNAL(clicked()), this, SLOT(onBtnManager()));
+	if (_isManagerPc) {
+		connect(_ui->btnManager, SIGNAL(clicked()), this, SLOT(onBtnManager()));
+	} else {
+		_ui->btnManager->setVisible(false);
+	}
 
 	/* setup lock desktop button*/
 	bool showLock = clientApp->getSettings()->value("showLockDesktopButton").toBool();
@@ -476,12 +479,12 @@ void Toolbar::onBtnManager()
 
 void Toolbar::onBtnLockDesktop()
 {
-	qDebug() << "onBtnLockDesktop()";
 	if (this->lockDesktopP.state() == QProcess::NotRunning) {
 		_ui->btnLockDesktop->setEnabled(false);
+		_ui->btnManager->setEnabled(false);
 		this->lockDesktopP.start("/bin/sh", QStringList() << "/opt/openslx/pvs2/lockDesktop.sh");
 
-		QTimer::singleShot(6 * 1000, this, SLOT(enableLockBtn()));
+		QTimer::singleShot(2 * 1000, this, SLOT(enableLockBtn()));
 
 	} else {
 		qDebug() << "trying to use lockDesktop-process while it is still running";
@@ -491,5 +494,6 @@ void Toolbar::onBtnLockDesktop()
 void Toolbar::enableLockBtn()
 {
 	_ui->btnLockDesktop->setEnabled(true);
+	_ui->btnManager->setEnabled(true);
 }
 
-- 
cgit v1.2.3-55-g7522