diff --git a/app/src/components/Controls/Sidebar.js b/app/src/components/Controls/Sidebar.js index a35a0af..406a9f3 100644 --- a/app/src/components/Controls/Sidebar.js +++ b/app/src/components/Controls/Sidebar.js @@ -152,6 +152,7 @@ const Sidebar = (props) => @@ -172,6 +173,7 @@ const Sidebar = (props) => diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js index 92fecb1..60f254f 100644 --- a/app/src/components/Settings/Settings.js +++ b/app/src/components/Settings/Settings.js @@ -107,7 +107,7 @@ const Settings = ({ name='Camera' autoWidth className={classes.selectEmpty} - disabled={webcams.length === 0} + disabled={webcams.length === 0 || me.webcamInProgress} > { webcams.map((webcam, index) => { @@ -138,7 +138,7 @@ const Settings = ({ name='Audio device' autoWidth className={classes.selectEmpty} - disabled={audioDevices.length === 0} + disabled={audioDevices.length === 0 || me.audioInProgress} > { audioDevices.map((audio, index) => {