Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Missing return statement

master
Håvar Aambø Fosstveit 2019-02-15 14:42:10 +01:00
parent 34b295cc81
commit bdfe2c32cc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/lib/Room.js
View File

@ -122,8 +122,11 @@ class Room extends EventEmitter
{ {
socket.emit('room-locked'); socket.emit('room-locked');
socket.disconnect(true); socket.disconnect(true);
return;
} }
socket.join(this._roomId);
const signalingPeer = { peerName : peerName, socket : socket }; const signalingPeer = { peerName : peerName, socket : socket };
const index = this._lastN.indexOf(peerName); const index = this._lastN.indexOf(peerName);
@ -139,6 +142,11 @@ class Room extends EventEmitter
socket.emit('room-ready'); socket.emit('room-ready');
} }
isLocked()
{
return this._locked;
}
authCallback(data) authCallback(data)
{ {
logger.debug('authCallback()'); logger.debug('authCallback()');

1
server/server.js
View File

@ -178,7 +178,6 @@ io.on('connection', (socket) =>
room = rooms.get(roomId); room = rooms.get(roomId);
} }
socket.join(roomId);
socket.room = roomId; socket.room = roomId;
room.handleConnection(peerName, socket); room.handleConnection(peerName, socket);