fix(devices): Do not select stored devices that are not available.

jitsi · Sep 6, 2024 · 0fa02ff · 0fa02ff
1 parent d2afd5e
commit 0fa02ff
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/react/features/base/settings/functions.web.ts b/react/features/base/settings/functions.web.ts
@@ -178,18 +178,20 @@ function _getUserSelectedDeviceId(options: {
         replacement = ''
     } = options;
 
-    // If there is no label at all, there is no need to fall back to checking
-    // the label for a fuzzy match.
-    if (!userSelectedDeviceLabel || !userSelectedDeviceId) {
-        return userSelectedDeviceId;
-    }
+    if (userSelectedDeviceId) {
+        const foundMatchingBasedonDeviceId = availableDevices?.find(
+            candidate => candidate.deviceId === userSelectedDeviceId);
 
-    const foundMatchingBasedonDeviceId = availableDevices?.find(
-        candidate => candidate.deviceId === userSelectedDeviceId);
+        // Prioritize matching the deviceId
+        if (foundMatchingBasedonDeviceId) {
+            return userSelectedDeviceId;
+        }
+    }
 
-    // Prioritize matching the deviceId
-    if (foundMatchingBasedonDeviceId) {
-        return userSelectedDeviceId;
+    // If there is no label at all, there is no need to fall back to checking
+    // the label for a fuzzy match.
+    if (!userSelectedDeviceLabel) {
+        return;
     }
 
     const strippedDeviceLabel