diff options
author | Björn Hagemeister | 2014-05-27 14:04:25 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-05-27 14:04:25 +0200 |
commit | fcff10f0477fd630d4ae985c5cec2363f30c00ca (patch) | |
tree | 911126e43615d1fc4269ad8db6544bdffc5d3967 /src/server | |
parent | Add icon for locked screen. Add monochrome and stylized connectionframe icons. (diff) | |
download | pvs2-fcff10f0477fd630d4ae985c5cec2363f30c00ca.tar.gz pvs2-fcff10f0477fd630d4ae985c5cec2363f30c00ca.tar.xz pvs2-fcff10f0477fd630d4ae985c5cec2363f30c00ca.zip |
By pushing reset button, also unlock all currently locked screens.
Diffstat (limited to 'src/server')
-rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 15 |
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) |