haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1130 from jitsi/fix-stopping-sharedvideo 

Stops player update before sending stopping of shared video.
This commit is contained in:
hristoterezov 2016-11-09 14:20:38 -06:00 committed by GitHub
parent 34ea330aa3 e34d86b485
commit 7f3323f7c0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/UI/shared_video/SharedVideo.js
View File

@ -84,6 +84,14 @@ export default class SharedVideoManager {
if(APP.conference.isLocalId(this.from)) {
showStopVideoPropmpt().then(() => {
// make sure we stop updates for playing before we send stop
// if we stop it after receiving self presence, we can end
// up sending stop playing, and on the other end it will not
// stop
if(this.intervalId) {
clearInterval(this.intervalId);
this.intervalId = null;
}
this.emitter.emit(
UIEvents.UPDATE_SHARED_VIDEO, this.url, 'stop');
JitsiMeetJS.analytics.sendEvent('sharedvideo.stoped');
@ -423,11 +431,6 @@ export default class SharedVideoManager {
}
}
if(this.intervalId) {
clearInterval(this.intervalId);
this.intervalId = null;
}
this.emitter.removeListener(UIEvents.AUDIO_MUTED,
this.localAudioMutedListener);
this.localAudioMutedListener = null;