Browse Source

Merge pull request #1094 from jitsi/hips-fixup

hips: fix handling senders / receivers when in P2P mode
dev1
Philipp Hancke 5 years ago
parent
commit
1efdbe8e66
No account linked to committer's email address
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      JitsiConference.js

+ 2
- 2
JitsiConference.js View File

1115
     this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, newTrack);
1115
     this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, newTrack);
1116
 
1116
 
1117
     // Setup E2EE handling, if supported.
1117
     // Setup E2EE handling, if supported.
1118
-    if (this._e2eeCtx) {
1118
+    if (!this.isP2PActive() && this._e2eeCtx) {
1119
         const activeTPC = this.getActivePeerConnection();
1119
         const activeTPC = this.getActivePeerConnection();
1120
         const sender = activeTPC ? activeTPC.findSenderForTrack(newTrack.track) : null;
1120
         const sender = activeTPC ? activeTPC.findSenderForTrack(newTrack.track) : null;
1121
 
1121
 
1654
     }
1654
     }
1655
 
1655
 
1656
     // Setup E2EE handling, if supported.
1656
     // Setup E2EE handling, if supported.
1657
-    if (this._e2eeCtx) {
1657
+    if (!this.isP2PActive() && this._e2eeCtx) {
1658
         const activeTPC = this.getActivePeerConnection();
1658
         const activeTPC = this.getActivePeerConnection();
1659
         const receiver = activeTPC ? activeTPC.findReceiverForTrack(track.track) : null;
1659
         const receiver = activeTPC ? activeTPC.findReceiverForTrack(track.track) : null;
1660
 
1660
 

Loading…
Cancel
Save