Merge branch 'master' of github.com:jitsi/jitsi-meet
This commit is contained in:
commit
02ca5e5732
|
@ -151,7 +151,7 @@ var DataChannels =
|
||||||
*/
|
*/
|
||||||
init: function (peerConnection, emitter) {
|
init: function (peerConnection, emitter) {
|
||||||
if(!config.openSctp)
|
if(!config.openSctp)
|
||||||
retrun;
|
return;
|
||||||
|
|
||||||
peerConnection.ondatachannel = this.onDataChannel;
|
peerConnection.ondatachannel = this.onDataChannel;
|
||||||
eventEmitter = emitter;
|
eventEmitter = emitter;
|
||||||
|
|
|
@ -3801,7 +3801,7 @@ module.exports = function(XMPP, eventEmitter) {
|
||||||
var self = this;
|
var self = this;
|
||||||
// Remove old ssrcs coming from the jid
|
// Remove old ssrcs coming from the jid
|
||||||
Object.keys(this.ssrc2jid).forEach(function (ssrc) {
|
Object.keys(this.ssrc2jid).forEach(function (ssrc) {
|
||||||
if (self.ssrc2jid[ssrc] == jid) {
|
if (self.ssrc2jid[ssrc] == from) {
|
||||||
delete self.ssrc2jid[ssrc];
|
delete self.ssrc2jid[ssrc];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -150,7 +150,7 @@ var DataChannels =
|
||||||
*/
|
*/
|
||||||
init: function (peerConnection, emitter) {
|
init: function (peerConnection, emitter) {
|
||||||
if(!config.openSctp)
|
if(!config.openSctp)
|
||||||
retrun;
|
return;
|
||||||
|
|
||||||
peerConnection.ondatachannel = this.onDataChannel;
|
peerConnection.ondatachannel = this.onDataChannel;
|
||||||
eventEmitter = emitter;
|
eventEmitter = emitter;
|
||||||
|
|
|
@ -570,7 +570,7 @@ module.exports = function(XMPP, eventEmitter) {
|
||||||
var self = this;
|
var self = this;
|
||||||
// Remove old ssrcs coming from the jid
|
// Remove old ssrcs coming from the jid
|
||||||
Object.keys(this.ssrc2jid).forEach(function (ssrc) {
|
Object.keys(this.ssrc2jid).forEach(function (ssrc) {
|
||||||
if (self.ssrc2jid[ssrc] == jid) {
|
if (self.ssrc2jid[ssrc] == from) {
|
||||||
delete self.ssrc2jid[ssrc];
|
delete self.ssrc2jid[ssrc];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue