Merge error fixed

Konard · Apr 23, 2019 · 6291493 · 6291493
1 parent e73246e
commit 6291493
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx b/bigbluebutton-html5/imports/ui/components/video-preview/component.jsx
@@ -215,7 +215,6 @@ class VideoPreview extends Component {
     const { cameraAllowed, isInitialDeviceSet, isStartSharingDisabled } = this.state;
     const getDevices = await navigator.mediaDevices.enumerateDevices();
     const hasVideoInput = getDevices.filter(device => device.kind === 'videoinput').length > 0;
-    const isStartSharingDisabled = !(hasVideoInput && cameraAllowed && isInitialDeviceSet);
 
     const newSharingDisabled = !(hasVideoInput && cameraAllowed && isInitialDeviceSet);
     if (newSharingDisabled !== isStartSharingDisabled) {