jakob/PairDrop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source 
# Conflicts:
#	server/index.js
This commit is contained in:
RobinLinus 2018-09-21 19:55:32 +02:00
commit b0fd89eb96
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/index.js
View file

@ -53,6 +53,7 @@ class SnapdropServer {
} }
_joinRoom(peer) { _joinRoom(peer) {
this._cancelKeepAlive(peer);
// if room doesn't exist, create it // if room doesn't exist, create it
if (!this._rooms[peer.ip]) { if (!this._rooms[peer.ip]) {
this._rooms[peer.ip] = {}; this._rooms[peer.ip] = {};
@ -84,8 +85,8 @@ class SnapdropServer {
} }
_leaveRoom(peer) { _leaveRoom(peer) {
// delete the peer
this._cancelKeepAlive(peer); this._cancelKeepAlive(peer);
// delete the peer
if (!this._rooms[peer.ip] || !this._rooms[peer.ip][peer.id]) return; if (!this._rooms[peer.ip] || !this._rooms[peer.ip][peer.id]) return;
delete this._rooms[peer.ip][peer.id]; delete this._rooms[peer.ip][peer.id];