From 43a9ed4776d6036b71de487a0a4b22a395ba457b Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Mon, 2 Jun 2014 15:24:10 +0200
Subject: Put Check if manager is running on machine into method. If
 student2tutor_exclusive is running, the manager running machine is not locked
 now.

---
 src/server/mainwindow/mainwindow.cpp | 30 ++++++++++++++++++++----------
 src/server/mainwindow/mainwindow.h   |  1 +
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 7279869..590d5ab 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -276,6 +276,21 @@ void MainWindow::tellClientCurrentSituation(Client* client)
 		client->lockScreen(true);
 }
 
+/***************************************************************************//**
+ * Checks if client and manager runs on same machine.
+ * @param client
+ * @return Return true, if pvsmanager is running on client.
+ */
+bool MainWindow::isManagerMachine(Client* client)
+{
+	foreach (const QHostAddress &address, QNetworkInterface::allAddresses())
+		if (address != QHostAddress(QHostAddress::LocalHost)
+				&& client != NULL
+				&& client->ip() == address.toString())
+			return true;
+	return false;
+}
+
 /*
  * Overridden methods
  */
@@ -626,15 +641,9 @@ void MainWindow::onButtonLock(bool checked)
 	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.
-		bool isManagerMachine = false;
-		foreach (const QHostAddress &address, QNetworkInterface::allAddresses())
-			if (address != QHostAddress(QHostAddress::LocalHost)
-					&& (*it)->client() != NULL
-					&& (*it)->client()->ip() == address.toString())
-				isManagerMachine = true;
-
-		if ((*it)->client() == NULL || isManagerMachine)
-			continue; // Don't lock the tutor or the manager running machine.
+		bool isManager = isManagerMachine((*it)->client());
+		if ((*it)->client() == NULL || isManager)
+			continue;
 		(*it)->client()->lockScreen(checked);
 	}
 }
@@ -874,7 +883,8 @@ void MainWindow::onVncServerStateChange(Client* client)
 					else
 					{
 						// Lock others and stop their clients
-						(*it)->client()->lockScreen(_mode == Mode::LockedMulticast);
+						bool isManager = isManagerMachine((*it)->client());
+						(*it)->client()->lockScreen(_mode == Mode::LockedMulticast && isManager != true);
 						(*it)->client()->stopVncClient();
 					}
 				}
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 25eb9aa..3866db5 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -78,6 +78,7 @@ private:
 	bool isValidClient(Client* client);
 	void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL);
 	void tellClientCurrentSituation(Client* client);
+	bool isManagerMachine(Client* client);
 
 	void closeEvent(QCloseEvent *e);
 	void changeEvent(QEvent *e);
-- 
cgit v1.2.3-55-g7522