Revert "fix(hangup): destroy local tracks on conference leave (#2502)"

This reverts commit 88325aeef2.
Turns out a conference with a password triggers a failed conference
join. It's going to be tricky to decipher when to do actual
cleanup, and where to shove that code, so reverting is easier for
now.
pull/2546/head jitsi-meet_2826
Leonard Kim 7 years ago committed by Дамян Минков
parent b00aaf1de7
commit ce6e8472f0
  1. 5
      modules/UI/UI.js
  2. 2
      modules/UI/videolayout/LargeVideoManager.js
  3. 7
      react/features/base/conference/middleware.js
  4. 1
      react/features/conference/components/Conference.web.js

@ -377,12 +377,11 @@ UI.start = function() {
};
/**
* Invokes cleanup of large video so it stops running polling tasks and stops
* displaying.
* Invokes cleanup of any deferred execution within relevant UI modules.
*
* @returns {void}
*/
UI.resetLargeVideo = () => {
UI.stopDaemons = () => {
VideoLayout.resetLargeVideo();
};

@ -129,8 +129,6 @@ export default class LargeVideoManager {
this._onVideoResolutionUpdate);
this.removePresenceLabel();
this.$container.remove();
}
/**

@ -17,7 +17,7 @@ import {
} from '../participants';
import { MiddlewareRegistry } from '../redux';
import UIEvents from '../../../../service/UI/UIEvents';
import { TRACK_ADDED, TRACK_REMOVED, destroyLocalTracks } from '../tracks';
import { TRACK_ADDED, TRACK_REMOVED } from '../tracks';
import {
createConference,
@ -144,11 +144,6 @@ function _conferenceFailedOrLeft({ dispatch, getState }, next, action) {
dispatch(setAudioOnly(true));
}
if (typeof APP === 'object') {
dispatch(destroyLocalTracks());
APP.UI.resetLargeVideo();
}
return result;
}

@ -87,6 +87,7 @@ class Conference extends Component<Props> {
* @inheritdoc
*/
componentWillUnmount() {
APP.UI.stopDaemons();
APP.UI.unregisterListeners();
APP.UI.unbindEvents();

Loading…
Cancel
Save