|
@@ -11,7 +11,9 @@ import {
|
11
|
11
|
pinParticipant
|
12
|
12
|
} from '../base/participants';
|
13
|
13
|
import { StateListenerRegistry, equals } from '../base/redux';
|
|
14
|
+import { isFollowMeActive } from '../follow-me';
|
14
|
15
|
import { selectParticipant } from '../large-video';
|
|
16
|
+
|
15
|
17
|
import { shouldDisplayTileView } from './functions';
|
16
|
18
|
import { setParticipantsWithScreenShare } from './actions';
|
17
|
19
|
|
|
@@ -48,12 +50,11 @@ StateListenerRegistry.register(
|
48
|
50
|
StateListenerRegistry.register(
|
49
|
51
|
/* selector */ state => state['features/base/tracks'],
|
50
|
52
|
/* listener */ debounce((tracks, store) => {
|
51
|
|
- if (!_getAutoPinSetting()) {
|
|
53
|
+ if (!_getAutoPinSetting() || isFollowMeActive(store)) {
|
52
|
54
|
return;
|
53
|
55
|
}
|
54
|
56
|
|
55
|
|
- const oldScreenSharesOrder
|
56
|
|
- = store.getState()['features/video-layout'].screenShares || [];
|
|
57
|
+ const oldScreenSharesOrder = store.getState()['features/video-layout'].screenShares || [];
|
57
|
58
|
const knownSharingParticipantIds = tracks.reduce((acc, track) => {
|
58
|
59
|
if (track.mediaType === 'video' && track.videoType === 'desktop') {
|
59
|
60
|
const skipTrack = _getAutoPinSetting() === 'remote-only' && track.local;
|