diff options
| author | Björn Hagemeister | 2014-05-26 18:34:36 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-26 18:34:36 +0200 |
| commit | 494727e1e5f0e459153e8845168545ad4a72e598 (patch) | |
| tree | 1d0328d6b7ea8d53aec693fa06681379cb20b998 /src/client/connectwindow/connectwindow.h | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-494727e1e5f0e459153e8845168545ad4a72e598.tar.gz pvs2-494727e1e5f0e459153e8845168545ad4a72e598.tar.xz pvs2-494727e1e5f0e459153e8845168545ad4a72e598.zip | |
Several changes:
Fixed segmentaion fault, which occured after streaming to all clients.
Added sessionName as command line argument to client, so that it connects immediatly after running to given sessionName.
If pvsclient shows connected status also display IP-Adress of the running pvsmanager.
Diffstat (limited to 'src/client/connectwindow/connectwindow.h')
| -rw-r--r-- | src/client/connectwindow/connectwindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h index 299a339..9319e45 100644 --- a/src/client/connectwindow/connectwindow.h +++ b/src/client/connectwindow/connectwindow.h @@ -63,7 +63,7 @@ private: int _hashErrorCount, _hashSslErrorCount, _certErrorCount, _ipErrorCount; int _discoveryInterval; - QByteArray _nameBytes; + QByteArray _sessionNameBytes; QByteArray _salt2; QUdpSocket _discoverySocket; NetworkMessage _packet; @@ -76,6 +76,7 @@ public: virtual ~ConnectWindow(); void setConnected(const bool connected); + void connectToSession(const QByteArray sessionName); protected: /* |