mirror of
https://github.com/schlagmichdoch/PairDrop.git
synced 2025-04-22 07:46:17 -04:00
Merge branch 'sw_digester' of https://github.com/schlagmichdoch/PairDrop into sw_digester
This commit is contained in:
commit
3b31472c52
7 changed files with 102 additions and 50 deletions
|
@ -251,7 +251,6 @@ export default class PairDropWsServer {
|
|||
return;
|
||||
}
|
||||
|
||||
this._leavePublicRoom(sender);
|
||||
this._joinPublicRoom(sender, message.publicRoomId);
|
||||
}
|
||||
|
||||
|
@ -312,7 +311,7 @@ export default class PairDropWsServer {
|
|||
|
||||
_joinPublicRoom(peer, publicRoomId) {
|
||||
// prevent joining of 2 public rooms simultaneously
|
||||
this._leavePublicRoom(peer);
|
||||
this._leavePublicRoom(peer, true);
|
||||
|
||||
this._joinRoom(peer, 'public-id', publicRoomId);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue