diff options
| author | Manuel Schneider | 2014-05-27 15:02:09 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-27 15:02:09 +0200 |
| commit | 49722504d243de076fdb01a463de43c8feb6edf8 (patch) | |
| tree | f7b62a24f3cd99bf574e048e54386c91596dceb2 /src/server/mainwindow/mainwindow.cpp | |
| parent | Unite BC and MC. Reducing complexity (diff) | |
| download | pvs2-49722504d243de076fdb01a463de43c8feb6edf8.tar.gz pvs2-49722504d243de076fdb01a463de43c8feb6edf8.tar.xz pvs2-49722504d243de076fdb01a463de43c8feb6edf8.zip | |
Adjust stopProjection
Diffstat (limited to 'src/server/mainwindow/mainwindow.cpp')
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 5fdf3db..421cd5f 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -586,22 +586,14 @@ void MainWindow::onButtonStudentToTutorExclusive() */ void MainWindow::onButtonStopProjection() { + // Unlock all clients for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) - { - Client *c = (**it).client(); - if (c == NULL) - continue; - c->stopVncClient(); - } + if ((*it)->client() != NULL) + (*it)->client()->lockScreen(false); - for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) - { - Client *c = (**it).client(); - if (c == NULL) - continue; - c->stopVncClient(); - c->stopVncServer(); - } + // Stop server (Clients get stopped on ACK) + if (_streamingSource != NULL) + _streamingSource->startVncServer(); } /***************************************************************************//** |