Drop _activeVncClient. _currentProjectionSource holds this information.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/server/net/client.h b/src/server/net/client.h
index 5623717..14e0f0e 100644
--- a/src/server/net/client.h
+++ b/src/server/net/client.h
@@ -45,10 +45,9 @@ public:
 	inline const QString  ip() const { return _socket->peerAddress().toString(); }
 	inline const int      id() const { return _id; }
 	inline const int      currentProjectionSource() const { return _currentProjectionSource; }
-	// To be replaced by states
-	inline const bool isActiveVncClient() const { return _activeVncClient; }
-	inline const bool isActiveVncServer() const { return _vncPort > 0; }
-	inline const bool isBroadcastSource() const { return _isBroadcastSource; }
+	inline const bool     isActiveVncClient() const { return _currentProjectionSource > 0; }
+	inline const bool     isActiveVncServer() const { return _vncPort > 0; }
+	inline const bool     isBroadcastSource() const { return _isBroadcastSource; }
 
 	// Setters
 	inline void setBroadcastSource(bool enable) { _isBroadcastSource = enable; }
@@ -75,10 +74,9 @@ private:
 	int            _timerIdAuthTimeout, _timerPingTimeout;
 	int            _id; // this client's unique id
 	bool           _isBroadcastSource; // Tells whether this client is currently the VNC broadcast source.
-	int            _currentProjectionSource;
 	QString        _vncRwPass, _vncRoPass;
 	int            _vncPort; // VNCserver state. Greater 0 -> active on this port. Equals 0 -> no server.
-	bool           _activeVncClient; // Flag indicating that the client is displaying a remote screen via VNC
+	int            _currentProjectionSource; // VNCclient state. indicating that the client is displaying a remote screen via VNC
 	bool           _isTutor; // Flag indicating that the client has been set as a tutor
 
 	static int     _clientIdCounter;