diff options
| author | Manuel Schneider | 2014-05-26 21:07:07 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-26 21:07:07 +0200 |
| commit | bf4c1798ae304d973c10b38577648319f2926e3b (patch) | |
| tree | 40219d8e0c205d9b66391570c82c3a5748ae2c37 /src | |
| parent | Remove unnecessary slots (diff) | |
| download | pvs2-bf4c1798ae304d973c10b38577648319f2926e3b.tar.gz pvs2-bf4c1798ae304d973c10b38577648319f2926e3b.tar.xz pvs2-bf4c1798ae304d973c10b38577648319f2926e3b.zip | |
Make tutor check implicit in lock screen
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/server/net/client.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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); |