summaryrefslogtreecommitdiffstats
path: root/src/server/mainwindow/mainwindow.cpp
diff options
context:
space:
mode:
authorManuel Schneider2014-05-28 17:27:04 +0200
committerManuel Schneider2014-05-28 17:27:04 +0200
commit6b3a98ee512299fffe3b0c6cf12a43bcf37318a3 (patch)
treeffb27fe88b4dafa5175edea3ed9bc360f1d9a5a2 /src/server/mainwindow/mainwindow.cpp
parentTry to reconnect if the pvsmgr gets disconnected (diff)
downloadpvs2-6b3a98ee512299fffe3b0c6cf12a43bcf37318a3.tar.gz
pvs2-6b3a98ee512299fffe3b0c6cf12a43bcf37318a3.tar.xz
pvs2-6b3a98ee512299fffe3b0c6cf12a43bcf37318a3.zip
Give Exclusive student to tutor correct funtion. Kill all projections on lock.
Diffstat (limited to 'src/server/mainwindow/mainwindow.cpp')
-rw-r--r--src/server/mainwindow/mainwindow.cpp5
1 files changed, 4 insertions, 1 deletions
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<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it)
{
// Check if client is Tutor or the manager is also running on this machine.