diff options
author | Björn Hagemeister | 2014-09-04 18:10:57 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-09-04 18:10:57 +0200 |
commit | de8cae01617b57ebd36a7d3fab3b4875b0da2255 (patch) | |
tree | 27a2fbc5db83225fc552000f7ddb5c778c55e920 /src/client/toolbar | |
parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
download | pvs2-de8cae01617b57ebd36a7d3fab3b4875b0da2255.tar.gz pvs2-de8cae01617b57ebd36a7d3fab3b4875b0da2255.tar.xz pvs2-de8cae01617b57ebd36a7d3fab3b4875b0da2255.zip |
The sessionID is ignored by manager if client is connecting via auto-connect.
Diffstat (limited to 'src/client/toolbar')
-rw-r--r-- | src/client/toolbar/toolbar.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 0111c1c..4b64b62 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -30,7 +30,7 @@ Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent) : Toolbar(parent) { qDebug() << "sessionName - constructor"; - _connectWindow->connectToSession(sessionName, NULL); + _connectWindow->connectToSession(sessionName, ""); } /***************************************************************************//** @@ -50,16 +50,7 @@ Toolbar::Toolbar(const bool autoConnect, QWidget *parent) : Toolbar(parent) if (autoConnect) { // Try getting manager ip. QString mgrIp = identifyMgrIP(); - qDebug() << "mgrIP: " << mgrIp; - if (mgrIp != NULL) { - qDebug() << "Starting WITH specific mgrIP"; - _connectWindow->connectToSession("", mgrIp); - } else { - qDebug() << "Starting WITHOUT specific mgrIP"; - _connectWindow->connectToSession("", NULL); - } - } else { - _connectWindow->connectToSession("", NULL); + _connectWindow->connectToSession("", mgrIp); } } @@ -183,7 +174,7 @@ QString Toolbar::identifyMgrIP() if (!conf.contains("rooms")) { qDebug() << "Invalid config file!"; - return NULL; + return ""; } QStringList rooms = conf.value("rooms").toStringList(); @@ -195,7 +186,7 @@ QString Toolbar::identifyMgrIP() conf.beginGroup(i); if (!conf.contains("mgrIP")) { qDebug() << "Invalid config file!"; - return NULL; + return ""; } // Find the managerIP of current room. @@ -222,7 +213,7 @@ QString Toolbar::identifyMgrIP() } conf.endGroup(); } - return NULL; + return ""; } /* |