From bdfe2c32cc961046890116303c0f98986846e9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Fri, 15 Feb 2019 14:42:10 +0100
Subject: [PATCH] Missing return statement

---
 server/lib/Room.js | 8 ++++++++
 server/server.js   | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/server/lib/Room.js b/server/lib/Room.js
index 283669e..741325a 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -122,8 +122,11 @@ class Room extends EventEmitter
 		{
 			socket.emit('room-locked');
 			socket.disconnect(true);
+			return;
 		}
 
+		socket.join(this._roomId);
+
 		const signalingPeer = { peerName : peerName, socket : socket };
 
 		const index = this._lastN.indexOf(peerName);
@@ -139,6 +142,11 @@ class Room extends EventEmitter
 		socket.emit('room-ready');
 	}
 
+	isLocked()
+	{
+		return this._locked;
+	}
+
 	authCallback(data)
 	{
 		logger.debug('authCallback()');
diff --git a/server/server.js b/server/server.js
index 88547f9..de42cdc 100755
--- a/server/server.js
+++ b/server/server.js
@@ -178,7 +178,6 @@ io.on('connection', (socket) =>
 		room = rooms.get(roomId);
 	}
 
-	socket.join(roomId);
 	socket.room = roomId;
 
 	room.handleConnection(peerName, socket);