Merge branch 'master' of github.com:jitsi/jitsi-meet

This commit is contained in:
hristoterezov 2015-01-27 11:56:43 +02:00
commit 02ca5e5732
4 changed files with 4 additions and 4 deletions

View File

@ -151,7 +151,7 @@ var DataChannels =
*/
init: function (peerConnection, emitter) {
if(!config.openSctp)
retrun;
return;
peerConnection.ondatachannel = this.onDataChannel;
eventEmitter = emitter;

View File

@ -3801,7 +3801,7 @@ module.exports = function(XMPP, eventEmitter) {
var self = this;
// Remove old ssrcs coming from the jid
Object.keys(this.ssrc2jid).forEach(function (ssrc) {
if (self.ssrc2jid[ssrc] == jid) {
if (self.ssrc2jid[ssrc] == from) {
delete self.ssrc2jid[ssrc];
}
});

View File

@ -150,7 +150,7 @@ var DataChannels =
*/
init: function (peerConnection, emitter) {
if(!config.openSctp)
retrun;
return;
peerConnection.ondatachannel = this.onDataChannel;
eventEmitter = emitter;

View File

@ -570,7 +570,7 @@ module.exports = function(XMPP, eventEmitter) {
var self = this;
// Remove old ssrcs coming from the jid
Object.keys(this.ssrc2jid).forEach(function (ssrc) {
if (self.ssrc2jid[ssrc] == jid) {
if (self.ssrc2jid[ssrc] == from) {
delete self.ssrc2jid[ssrc];
}
});