diff options
| author | Manuel Schneider | 2014-09-03 15:40:39 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-09-03 15:40:39 +0200 |
| commit | 6017ad54c22bcb991c832f90d2a19722198886bb (patch) | |
| tree | 384bbf35357aba506d2bae131abc4747b8c30af0 /src/client/connectwindow | |
| parent | Change system settings path. Change name of config file (diff) | |
| parent | Added german translations for client. (diff) | |
| download | pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.gz pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.xz pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/client/connectwindow')
| -rw-r--r-- | src/client/connectwindow/connectwindow.cpp | 9 | ||||
| -rw-r--r-- | src/client/connectwindow/connectwindow.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp index 7f24281..90cba27 100644 --- a/src/client/connectwindow/connectwindow.cpp +++ b/src/client/connectwindow/connectwindow.cpp @@ -158,13 +158,13 @@ void ConnectWindow::showEvent(QShowEvent* event) * if not --> connect to given sessionName. * @param sessionName */ -void ConnectWindow::connectToSession(const QByteArray sessionName) +void ConnectWindow::connectToSession(const QByteArray sessionName, QString mgrIP) { if (_connected || _state != Idle) return; _state = Scanning; this->updateState(); - _serverDiscovery.start(sessionName); + _serverDiscovery.start(sessionName, mgrIP); } /* @@ -199,7 +199,8 @@ void ConnectWindow::onBtnConnection() { // Connect (scan for session) _tryReconnect = true; - connectToSession(_ui->lineEditName->text().toUtf8()); + // qDebug() << _ui->lineEditName->text().toUtf8(); + connectToSession(_ui->lineEditName->text().toUtf8(), NULL); } } @@ -279,5 +280,5 @@ void ConnectWindow::onConnectionDisconnected() _state = Idle; this->updateState(); if (_tryReconnect) - connectToSession(_ui->lineEditName->text().toUtf8()); + connectToSession(_ui->lineEditName->text().toUtf8(), NULL); } diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h index df112fe..a786119 100644 --- a/src/client/connectwindow/connectwindow.h +++ b/src/client/connectwindow/connectwindow.h @@ -54,7 +54,7 @@ public: explicit ConnectWindow(QWidget *parent = NULL); virtual ~ConnectWindow(); - void connectToSession(const QByteArray sessionName); + void connectToSession(const QByteArray sessionName, QString mgrIP); private: Ui::ConnectWindow *_ui; |