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/toolbar/toolbar.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/toolbar/toolbar.h')
| -rw-r--r-- | src/client/toolbar/toolbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h index f01e4ef..c85c501 100644 --- a/src/client/toolbar/toolbar.h +++ b/src/client/toolbar/toolbar.h @@ -30,7 +30,7 @@ class Toolbar : public QWidget Q_OBJECT public: - explicit Toolbar(QWidget *parent = 0); + explicit Toolbar(const QByteArray sessionName, QWidget *parent = 0); virtual ~Toolbar(); private: |