summaryrefslogtreecommitdiffstats
path: root/src/client/connectwindow/connectwindow.cpp
diff options
context:
space:
mode:
authorBjörn Hagemeister2014-08-25 18:08:15 +0200
committerBjörn Hagemeister2014-08-25 18:08:15 +0200
commit6cb63e7e30906f428c601ba00fd15c14e07093cf (patch)
treef83ea27e10616a384c26480e662854cf02ac8834 /src/client/connectwindow/connectwindow.cpp
parentNew Feature: Button for reloading room configuration of choosable room. (diff)
downloadpvs2-6cb63e7e30906f428c601ba00fd15c14e07093cf.tar.gz
pvs2-6cb63e7e30906f428c601ba00fd15c14e07093cf.tar.xz
pvs2-6cb63e7e30906f428c601ba00fd15c14e07093cf.zip
Client is able to auto - connect to the same room belonging manager.
Diffstat (limited to 'src/client/connectwindow/connectwindow.cpp')
-rw-r--r--src/client/connectwindow/connectwindow.cpp9
1 files changed, 5 insertions, 4 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);
}