From dbd34121915d2a361d5231ff7ca24bc43058d141 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Wed, 4 Apr 2018 11:52:33 -0700
Subject: [PATCH] Fix another race condition
---
src/react-components/ui-root.js | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index 4ad6b1a08..b51649860 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -414,10 +414,19 @@ class UIRoot extends Component {
this.setState({ entryStep: ENTRY_STEPS.audio_setup });
};
- fetchMicDevices = async () => {
- const mediaDevices = await navigator.mediaDevices.enumerateDevices();
- this.setState({
- micDevices: mediaDevices.filter(d => d.kind === "audioinput").map(d => ({ deviceId: d.deviceId, label: d.label }))
+ fetchMicDevices = () => {
+ return new Promise(resolve => {
+ navigator.mediaDevices.enumerateDevices().then(mediaDevices => {
+ console.log(resolve);
+ this.setState(
+ {
+ micDevices: mediaDevices
+ .filter(d => d.kind === "audioinput")
+ .map(d => ({ deviceId: d.deviceId, label: d.label }))
+ },
+ resolve
+ );
+ });
});
};
--
GitLab