|
|
@@ -101,6 +101,11 @@ import VideoSettingsButton from './VideoSettingsButton';
|
|
101
|
101
|
*/
|
|
102
|
102
|
type Props = {
|
|
103
|
103
|
|
|
|
104
|
+ /**
|
|
|
105
|
+ * String showing if the virtual background type is desktop-share.
|
|
|
106
|
+ */
|
|
|
107
|
+ _backgroundType: String,
|
|
|
108
|
+
|
|
104
|
109
|
/**
|
|
105
|
110
|
* Whether or not the chat feature is currently displayed.
|
|
106
|
111
|
*/
|
|
|
@@ -891,7 +896,7 @@ class Toolbox extends Component<Props> {
|
|
891
|
896
|
* @returns {void}
|
|
892
|
897
|
*/
|
|
893
|
898
|
_onToolbarToggleScreenshare() {
|
|
894
|
|
- if (!this.props._desktopSharingEnabled) {
|
|
|
899
|
+ if (!this.props._desktopSharingEnabled || this.props._backgroundType === 'desktop-share') {
|
|
895
|
900
|
return;
|
|
896
|
901
|
}
|
|
897
|
902
|
|
|
|
@@ -1371,6 +1376,7 @@ function _mapStateToProps(state) {
|
|
1371
|
1376
|
_clientWidth: clientWidth,
|
|
1372
|
1377
|
_conference: conference,
|
|
1373
|
1378
|
_desktopSharingEnabled: desktopSharingEnabled,
|
|
|
1379
|
+ _backgroundType: state['features/virtual-background'].backgroundType,
|
|
1374
|
1380
|
_desktopSharingDisabledTooltipKey: desktopSharingDisabledTooltipKey,
|
|
1375
|
1381
|
_dialog: Boolean(state['features/base/dialog'].component),
|
|
1376
|
1382
|
_feedbackConfigured: Boolean(callStatsID),
|