diff options
| author | sr | 2013-02-05 19:48:39 +0100 |
|---|---|---|
| committer | sr | 2013-02-05 19:48:39 +0100 |
| commit | e9b4cb4721b7c7f02728e22f92f5ad7a94828521 (patch) | |
| tree | 14e7573bf8ec0764cb9b9519f81ceb49830b777a /src/server/net/client.cpp | |
| parent | ... (diff) | |
| download | pvs2-e9b4cb4721b7c7f02728e22f92f5ad7a94828521.tar.gz pvs2-e9b4cb4721b7c7f02728e22f92f5ad7a94828521.tar.xz pvs2-e9b4cb4721b7c7f02728e22f92f5ad7a94828521.zip | |
[SERVER] Go back from ClientId to int, so queued signal/slot connections work
Diffstat (limited to 'src/server/net/client.cpp')
| -rw-r--r-- | src/server/net/client.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 26c1dd2..d6002a6 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -16,7 +16,7 @@ #define CHALLENGE_LEN 20 -ClientId Client::_clientIdCounter = 0; +int Client::_clientIdCounter = 0; Client::Client(QSslSocket* socket) : _socket(socket), _authed(0), _timerDelete(0), _desiredProjectionSource(0), _isProjectionSource(false), @@ -198,12 +198,12 @@ void Client::handleMsg() { // Client tells us that it started or stopped displaying a remote screen via VNC _activeVncClient = (_fromClient.getFieldString("ENABLED").toInt() != 0); - const ClientId other = (ClientId)_fromClient.getFieldString("CLIENTID").toInt(); + const int other = (int)_fromClient.getFieldString("CLIENTID").toInt(); if (!_activeVncClient && other == 0) _desiredProjectionSource = 0; - ClientId last = _currentProjectionSource; + int last = _currentProjectionSource; if (!_activeVncClient) _currentProjectionSource = 0; else |