From 6decac6613fef21869784df0d83a0b7c7d1c2008 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 28 Oct 2016 16:14:07 +0200
Subject: [client] Allow ESC key to cancel projection in hybrid mode

---
 src/client/net/serverconnection.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/client/net/serverconnection.cpp')

diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp
index 448b200..46f2538 100644
--- a/src/client/net/serverconnection.cpp
+++ b/src/client/net/serverconnection.cpp
@@ -262,15 +262,28 @@ void ServerConnection::handleMsg()
 		}
 	} else if (id == _LOCK) {
 		const bool enable = (_fromServer.getFieldString("ENABLE").toInt() != 0);
-		if (enable)
+		if (enable && !clientApp->isConnectedToLocalManager()) {
 			_blank->lock(_fromServer.getFieldString("MESSAGE"));
-		else
+		} else {
 			_blank->unlock();
+		}
 	} else if (id == _ATTENTION) {
 		emit attentionChanged(_fromServer.getFieldString(_ENABLE) == __TRUE);
 	}
 }
 
+void ServerConnection::checkLocalConnection()
+{
+	if (_socket == NULL) {
+		return;
+	}
+	if (_socket->peerAddress() == _socket->localAddress()) {
+		_isLocalConnection = 1;
+	} else {
+		_isLocalConnection = 0;
+	}
+}
+
 /*
  * Override
  */
-- 
cgit v1.2.3-55-g7522