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/server/mainwindow/mainwindow.cpp | 18 +++++++++++-------
 src/server/mainwindow/mainwindow.h   |  1 -
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/server/mainwindow')

diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 87e7471..c9eaf32 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -304,6 +304,7 @@ void MainWindow::tellClientCurrentSituation(Client* client)
  */
 void MainWindow::tryToUseRoomTemplate()
 {
+	QMap<QString, QMap<QString, QPoint> > roomsList;
 	SYSTEM_SETTINGS(conf);
 
 	if (!conf.contains("rooms")) {
@@ -327,7 +328,7 @@ void MainWindow::tryToUseRoomTemplate()
 		for (int j = 0; j < size; j++) {
 			conf.setArrayIndex(j);
 			// qDebug() << "ip: " << conf.value("ip").toString() << " pos: " << conf.value("pos").toPoint();
-			_rooms[i].append(qMakePair(conf.value("ip").toString(), conf.value("pos").toPoint()));
+			roomsList[i].insert(conf.value("ip").toString(), conf.value("pos").toPoint());
 		}
 		conf.endArray();
 
@@ -338,6 +339,7 @@ void MainWindow::tryToUseRoomTemplate()
 			if (address != QHostAddress(QHostAddress::LocalHost) && mgrIP == address.toString())
 			{
 				qDebug("Found this ip in config.");
+				Global::setCurrentRoom(i);
 				int size = conf.beginReadArray("client");
 				for (int j = 0; j < size; ++j) {
 					conf.setArrayIndex(j);
@@ -371,6 +373,7 @@ void MainWindow::tryToUseRoomTemplate()
 		}
 		conf.endGroup();
 	}
+	Global::setRooms(roomsList);
 }
 
 /***************************************************************************//**
@@ -696,8 +699,8 @@ void MainWindow::onButtonReloadRoomConfig()
 {
 	connect(_reloadWindow->ui->buttonBox, SIGNAL(accepted()), this, SLOT(onReloadRoomOk()));
 	connect(_reloadWindow->ui->buttonBox, SIGNAL(rejected()), this, SLOT(onReloadRoomCancel()));
-	qDebug() << "in onButtonReloadRoomConfig!" << "size of room: " << _rooms.size();
-	QList<QString> keyList = _rooms.keys();
+	qDebug() << "in onButtonReloadRoomConfig!" << "size of room: " << Global::getRooms().size();
+	QList<QString> keyList = Global::getRooms().keys();
 	for (QList<QString>::iterator it = keyList.begin(); it != keyList.end() ; it++) {
 		_reloadWindow->ui->roomList->addItem(*it);
 	}
@@ -731,17 +734,18 @@ void MainWindow::onReloadRoomOk()
 		// Load new room configuration.
 		QString roomToReload = _reloadWindow->ui->roomList->currentItem()->data(0).toString();
 		// qDebug() << roomToReload;
+		Global::setCurrentRoom(roomToReload);
 
 		_reloadWindow->ui->roomList->clear();
 		_reloadWindow->hide();
 
-		QList<QPair<QString, QPoint>> room = _rooms[roomToReload];
+		QMap<QString, QPoint> room = Global::getRooms()[roomToReload];
 		// qDebug() << " Room: " << room;
 		// qDebug() << "_rooms: " << _rooms;
-		for (QList<QPair<QString, QPoint>>::iterator it = room.begin(); it != room.end(); ++it)
+		for (QMap<QString, QPoint>::iterator it = room.begin(); it != room.end(); ++it)
 		{
-			QString computerId = (*it).first;
-			QPoint pos = (*it).second;
+			QString computerId = it.key();
+			QPoint pos = it.value();
 
 			qDebug() << "ComputerID: " << computerId;
 			qDebug() << "Pos: " << pos;
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index f8d0164..488ecc4 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -65,7 +65,6 @@ private:
 	DiscoveryListener       *_discoveryListener;
 	FileDownloader          _fileDownloader;
 	QStringList             _tutorList;
-	QMap<QString, QList<QPair<QString, QPoint> > > _rooms;
 
 	static const QString sStrTutorNdef;
 	static const QString sStrTutorOffline;
-- 
cgit v1.2.3-55-g7522