From 6b3a98ee512299fffe3b0c6cf12a43bcf37318a3 Mon Sep 17 00:00:00 2001 From: Manuel Schneider Date: Wed, 28 May 2014 17:27:04 +0200 Subject: Give Exclusive student to tutor correct funtion. Kill all projections on lock. --- src/server/mainwindow/mainwindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 7279869..b25f416 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -594,7 +594,7 @@ void MainWindow::onButtonStudentToTutorExclusive() else if (_tutorFrame->client() == NULL) QMessageBox::critical(this, tr("Projection"), sStrTutorOffline); else - changeProjection(_tutorFrame->client(), Mode::LockedMulticast, _selectedFrame->client()); + changeProjection(_selectedFrame->client(), Mode::LockedMulticast, _tutorFrame->client()); } @@ -623,6 +623,9 @@ void MainWindow::onButtonStopProjection() */ void MainWindow::onButtonLock(bool checked) { + // Stop all projections + onButtonStopProjection(); + for (QList::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) { // Check if client is Tutor or the manager is also running on this machine. -- cgit v1.2.3-55-g7522