|
@@ -8,8 +8,15 @@ import { getReplaceParticipant } from '../config/functions';
|
8
|
8
|
import { connect, disconnect, hangup } from '../connection/actions';
|
9
|
9
|
import { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection/constants';
|
10
|
10
|
import { JitsiConferenceEvents, JitsiE2ePingEvents } from '../lib-jitsi-meet';
|
11
|
|
-import { setAudioMuted, setAudioUnmutePermissions, setVideoMuted, setVideoUnmutePermissions } from '../media/actions';
|
|
11
|
+import {
|
|
12
|
+ gumPending,
|
|
13
|
+ setAudioMuted,
|
|
14
|
+ setAudioUnmutePermissions,
|
|
15
|
+ setVideoMuted,
|
|
16
|
+ setVideoUnmutePermissions
|
|
17
|
+} from '../media/actions';
|
12
|
18
|
import { MEDIA_TYPE } from '../media/constants';
|
|
19
|
+import { IGUMPendingState } from '../media/types';
|
13
|
20
|
import {
|
14
|
21
|
dominantSpeakerChanged,
|
15
|
22
|
participantKicked,
|
|
@@ -1052,6 +1059,11 @@ export function redirect(vnode: string, focusJid: string, username: string) {
|
1052
|
1059
|
.then(() => dispatch(conferenceWillInit()))
|
1053
|
1060
|
.then(() => dispatch(connect()))
|
1054
|
1061
|
.then(() => {
|
|
1062
|
+
|
|
1063
|
+ // Clear the gum pending state in case we have set it to pending since we are starting the
|
|
1064
|
+ // conference without tracks.
|
|
1065
|
+ dispatch(gumPending([ MEDIA_TYPE.AUDIO, MEDIA_TYPE.VIDEO ], IGUMPendingState.NONE));
|
|
1066
|
+
|
1055
|
1067
|
// FIXME: Workaround for the web version. To be removed once we get rid of conference.js
|
1056
|
1068
|
if (typeof APP !== 'undefined') {
|
1057
|
1069
|
APP.conference.startConference([]);
|