From 49722504d243de076fdb01a463de43c8feb6edf8 Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Tue, 27 May 2014 15:02:09 +0200 Subject: Adjust stopProjection --- src/server/mainwindow/mainwindow.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/server/mainwindow/mainwindow.cpp') 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::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::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(); } /***************************************************************************//** -- cgit v1.2.3-55-g7522