...

1 files changed, 4 insertions, 2 deletions

diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 95139a9..26c1dd2 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -203,12 +203,13 @@ void Client::handleMsg()
 			if (!_activeVncClient && other == 0)
 				_desiredProjectionSource = 0;
 
-			emit vncClientStateChange(this, _currentProjectionSource);
-
+			ClientId last = _currentProjectionSource;
 			if (!_activeVncClient)
 				_currentProjectionSource = 0;
 			else
 				_currentProjectionSource = other;
+
+			emit vncClientStateChange(this, last);
 		}
 		return;
 	}
@@ -294,6 +295,7 @@ void Client::stopVncServer()
 
 void Client::stopVncClient()
 {
+	_activeVncClient = false;
 	_toClient.reset();
 	_toClient.setField(_ID, _VNCCLIENT);
 	sendMessage(_toClient);