From dd12d76a5d8b7404339e44014a08c1f9c6ab1dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Fri, 5 Apr 2019 23:17:43 +0200
Subject: [PATCH] Some small fixes to button disabled on load.

---
 app/src/components/Controls/Sidebar.js  | 2 ++
 app/src/components/Settings/Settings.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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) =>
 				<Fab
 					aria-label='Mute mic'
 					className={classes.fab}
+					disabled={!me.canSendMic || me.audioInProgress}
 					color={micState === 'on' ? 'default' : 'secondary'}
 					size={smallScreen ? 'large' : 'medium'}
 					onClick={() =>
@@ -172,6 +173,7 @@ const Sidebar = (props) =>
 				<Fab
 					aria-label='Mute video'
 					className={classes.fab}
+					disabled={!me.canSendWebcam || me.webcamInProgress}
 					color={webcamState === 'on' ? 'default' : 'secondary'}
 					size={smallScreen ? 'large' : 'medium'}
 					onClick={() =>
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) =>
 						{