summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/server/mainwindow/mainwindow.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 7f0586f..a3f77e4 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -616,7 +616,7 @@ void MainWindow::onButtonStudentToTutorExclusive()
/***************************************************************************//**
* Handle Button StopProjection.
* Set ProjectionSource of each client to false, stop the active VNC Server
- * and the active VNC Client(s).
+ * and the active VNC Client(s) and unlock all screens.
*/
void MainWindow::onButtonStopProjection()
{
@@ -626,22 +626,15 @@ void MainWindow::onButtonStopProjection()
if (c == NULL)
continue;
c->stopVncClient();
- }
-
- for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it)
- {
- Client *c = (**it).client();
- if (c == NULL)
- continue;
- c->stopVncClient();
- c->stopVncServer();
+ c->stopVncServer();
+ c->lockScreen(false);
}
}
/***************************************************************************//**
* Handle button to lock or unlock screens of client(s).
* If already locked, do nothing, else lock or unlock the clients, except the
- * tutor.
+ * tutor and the manager running machine.
* @param checked
*/
void MainWindow::onButtonLock(bool checked)