From c984899f52f11d7148785c9a6cb377b23da87228 Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Thu, 19 May 2016 15:55:02 +0200
Subject: Closes bug #2807. (And also cleans the code (a bit))

---
 src/server/net/client.cpp            | 2 +-
 src/server/net/discoverylistener.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server/net')

diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp
index 8a10cd8..e55fb3b 100644
--- a/src/server/net/client.cpp
+++ b/src/server/net/client.cpp
@@ -255,7 +255,7 @@ void Client::handleMsg()
 			QByteArray hash(_fromClient.getFieldBytes(_HASH));
 			QByteArray challenge(_fromClient.getFieldBytes(_CHALLENGE));
 			if (genSha1(&Global::sessionNameArray(), &_challenge) != hash
-					&& !(Global::getRooms()[Global::getCurrentRoom()]->clientPositions.contains(_socket->peerAddress().toString())))
+					&& !(Global::getCurrentRoom()->clientPositions.contains(_socket->peerAddress().toString())))
 			{	// Challenge reply is invalid, drop client
 				NetworkMessage msgErr;
 				msgErr.buildErrorMessage("Challenge reply invalid.");
diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp
index c5b06fc..c0b80b8 100644
--- a/src/server/net/discoverylistener.cpp
+++ b/src/server/net/discoverylistener.cpp
@@ -159,9 +159,9 @@ void DiscoveryListener::onReadyRead()
 		if (!Network::isAddressInList(QString::fromUtf8(iplist), addr.toString()))
 			continue;
 		// If so, check if the submitted hash seems valid
-        if (Global::getCurrentRoom() == "") { continue; }
+        // if (Global::getCurrentRoom() == "") { continue; } // TODO: Can we remove this check?
 		if (genSha1(&Global::sessionNameArray(), &salt1, &iplist) != hash &&
-				!(Global::getRooms()[Global::getCurrentRoom()]->clientPositions.contains(addr.toString())))
+				!(Global::getCurrentRoom()->clientPositions.contains(addr.toString())))
 		{
 			// did not match local session name and client is not in same room.
 			continue;
-- 
cgit v1.2.3-55-g7522