From fcff10f0477fd630d4ae985c5cec2363f30c00ca Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Tue, 27 May 2014 14:04:25 +0200
Subject: By pushing reset button, also unlock all currently locked screens.

---
 src/server/mainwindow/mainwindow.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/server/mainwindow/mainwindow.cpp')

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)
-- 
cgit v1.2.3-55-g7522