From bf4c1798ae304d973c10b38577648319f2926e3b Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Mon, 26 May 2014 21:07:07 +0200
Subject: Make tutor check implicit in lock screen

---
 src/server/mainwindow/mainwindow.cpp | 2 +-
 src/server/net/client.cpp            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 26508d2..3bdf0e6 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -654,7 +654,7 @@ void MainWindow::onButtonLock(bool checked)
 					&& (*it)->client()->ip() == address.toString())
 				isManagerMachine = true;
 
-		if ((*it)->client() == NULL || (*it)->isTutor() || isManagerMachine)
+		if ((*it)->client() == NULL || isManagerMachine)
 			continue; // Don't lock the tutor or the manager running machine.
 		(*it)->client()->lockScreen(checked);
 	}
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 70a1783..7eeb3d4 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -319,6 +319,8 @@ void Client::stopVncClient()
 /******************************************************************************/
 void Client::lockScreen(bool lock)
 {
+	if (_isTutor)
+		return;
 	NetworkMessage msg;
 	msg.setField(_ID, _LOCK);
 	msg.setField(_ENABLE, lock ? __TRUE : __FALSE);
-- 
cgit v1.2.3-55-g7522