From 6cb63e7e30906f428c601ba00fd15c14e07093cf Mon Sep 17 00:00:00 2001 From: Björn Hagemeister Date: Mon, 25 Aug 2014 18:08:15 +0200 Subject: Client is able to auto - connect to the same room belonging manager. --- src/client/connectwindow/connectwindow.cpp | 9 +++++---- src/client/connectwindow/connectwindow.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/client/connectwindow') 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; -- cgit v1.2.3-55-g7522