From de8cae01617b57ebd36a7d3fab3b4875b0da2255 Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Thu, 4 Sep 2014 18:10:57 +0200
Subject: The sessionID is ignored by manager if client is connecting via
 auto-connect.

---
 src/client/toolbar/toolbar.cpp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'src/client/toolbar/toolbar.cpp')

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 "";
 }
 
 /*
-- 
cgit v1.2.3-55-g7522