|
|
@@ -1331,7 +1331,14 @@ JitsiConference.prototype.onIncomingCall
|
|
1331
|
1331
|
try {
|
|
1332
|
1332
|
jingleSession.acceptOffer(
|
|
1333
|
1333
|
jingleOffer,
|
|
1334
|
|
- null /* success */,
|
|
|
1334
|
+ () => {
|
|
|
1335
|
+ // If for any reason invite for the JVB session arrived after
|
|
|
1336
|
+ // the P2P has been established already the media transfer needs
|
|
|
1337
|
+ // to be turned off here.
|
|
|
1338
|
+ if (this.isP2PActive() && this.jvbJingleSession) {
|
|
|
1339
|
+ this._suspendMediaTransferForJvbConnection();
|
|
|
1340
|
+ }
|
|
|
1341
|
+ },
|
|
1335
|
1342
|
error => {
|
|
1336
|
1343
|
GlobalOnErrorHandler.callErrorHandler(error);
|
|
1337
|
1344
|
logger.error(
|
|
|
@@ -2002,9 +2009,6 @@ JitsiConference.prototype._onIceConnectionEstablished
|
|
2002
|
2009
|
|
|
2003
|
2010
|
// Stop media transfer over the JVB connection
|
|
2004
|
2011
|
if (this.jvbJingleSession) {
|
|
2005
|
|
- // FIXME if for whatever reason invite from Jicofo for the JVB
|
|
2006
|
|
- // connection arrives, after the P2P has been established
|
|
2007
|
|
- // this needs to be called as well.
|
|
2008
|
2012
|
this._suspendMediaTransferForJvbConnection();
|
|
2009
|
2013
|
}
|
|
2010
|
2014
|
|