snapdrop

A Progressive Web App for local file sharing
git clone http://git.hanabi.in/repos/snapdrop.git
Log | Files | Refs | README | LICENSE

commit b0fd89eb96f69279a01b64ce5db29c020838f87d
parent 4cf2beda9075d75e1efc6dca3dc0e390612882fd
Author: RobinLinus <robinlinus@users.noreply.github.com>
Date:   Fri, 21 Sep 2018 19:55:32 +0200

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

# Conflicts:
#	server/index.js

Diffstat:
Mserver/index.js | 3++-
1 file changed, 2 insertions(+), 1 deletion(-)

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