Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-04-03 07:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dbkr/show_device_actually_in_use' of github.com:vector-im/element-call into dbkr/show_device_actually_in_use

Browse Source
This commit is contained in:
David Baker
2023-10-06 12:00:27 +01:00
parent 6d2d5641a5 8884982846
commit 2f05125f45
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings/SettingsModal.tsx
View File

@@ -99,9 +99,10 @@ export const SettingsModal = (props: Props) => {
let selectedKey = devices.selectedId;
// We may present a different device as the currently selected one if we have an active track
// from the default device, because the default device may have changed since we acquired the
// track, in which case we want to display the one we're actually using rather than what the
// default is now. We only do this if we've selected, and are using, the default device
// from the default device, because the default device of the OS may have changed since we acquired the
// track, but EC did not update the track to match the new default in which case we want to display the
// one we're actually using rather than what the default is now. We only do this if we've selected, and
// are using, the default device
if (
trackUsedByRoom &&
(devices.selectedId === "" ||