Skip to content

Commit

Permalink
Merge pull request #4688 from mozilla/audio-panel-preference-fix
Browse files Browse the repository at this point in the history
Audio panel settings should override audio settings
  • Loading branch information
keianhzo authored Sep 29, 2021
2 parents 48bbc73 + 7a9e552 commit 6c2e227
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/update-audio-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export function getCurrentAudioSettings(el) {
const sourceType = APP.sourceType.get(el);
const defaults = defaultSettingsForSourceType.get(sourceType);
const sceneOverrides = APP.sceneAudioDefaults.get(sourceType);
const audioDebugPanelOverrides = APP.audioDebugPanelOverrides.get(sourceType);
const audioOverrides = APP.audioOverrides.get(el);
const audioDebugPanelOverrides = APP.audioDebugPanelOverrides.get(sourceType);
const zoneSettings = APP.zoneOverrides.get(el);
const preferencesOverrides =
APP.store.state.preferences.audioOutputMode === "audio" ? { audioType: AudioType.Stereo } : {};
Expand All @@ -42,8 +42,8 @@ export function getCurrentAudioSettings(el) {
{},
defaults,
sceneOverrides,
audioDebugPanelOverrides,
audioOverrides,
audioDebugPanelOverrides,
zoneSettings,
preferencesOverrides,
safariOverrides
Expand Down

0 comments on commit 6c2e227

Please sign in to comment.