Fix input devices logic (#844)

wulkano · May 1, 2020 · 9cdafe9 · 9cdafe9
1 parent b3c37ec
commit 9cdafe9
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/main/common/aperture.js b/main/common/aperture.js
@@ -107,7 +107,7 @@ const startRecording = async options => {
     if (audioInputDeviceId) {
       apertureOptions.audioDeviceId = audioInputDeviceId;
     } else {
-      const [defaultAudioDevice] = await audioDevices();
+      const [defaultAudioDevice] = await getAudioDevices();
       apertureOptions.audioDeviceId = defaultAudioDevice && defaultAudioDevice.id;
     }
   }
@@ -208,23 +208,28 @@ const stopRecording = async () => {
   }
 };
 
-module.exports = {
-  startRecording,
-  stopRecording,
-  getAudioDevices: async () => {
-    if (hasMicrophoneAccess()) {
-      try {
-        let devices = await audioDevices();
-        if (!Array.isArray(devices)) {
-          devices = await getInputDevices();
-          return devices.map(({uid, name}) => ({id: uid, name}));
-        }
-      } catch (error) {
-        showError(error, {reportToSentry: true});
-        return [];
+const getAudioDevices = async () => {
+  if (hasMicrophoneAccess()) {
+    try {
+      let devices = await audioDevices();
+
+      if (Array.isArray(devices)) {
+        return devices;
       }
-    }
 
-    return [];
+      devices = await getInputDevices();
+      return devices.map(({uid, name}) => ({id: uid, name}));
+    } catch (error) {
+      showError(error, {reportToSentry: true});
+      return [];
+    }
   }
+
+  return [];
+};
+
+module.exports = {
+  startRecording,
+  stopRecording,
+  getAudioDevices
 };