Merge pull request #15995 from nextcloud/fix/noid/breaking-output

Antreesy · web-flow · commit c40fc9ae630a · 2025-09-24T16:21:14.000+02:00
diff --git a/src/composables/useDevices.js b/src/composables/useDevices.js
@@ -200,7 +200,7 @@ export const useDevices = createSharedComposable(function() {
 		updateAudioStream()
 		updateVideoStream()
 
-		if (mediaDevicesManager.attributes.audioOutputId !== undefined) {
+		if (mediaDevicesManager.attributes.audioOutputId !== soundsStore.audioOutputDeviceId) {
 			soundsStore.setGeneralAudioOutput(mediaDevicesManager.attributes.audioOutputId)
 		}
 	}
diff --git a/src/stores/sounds.js b/src/stores/sounds.js
@@ -38,6 +38,7 @@ export const useSoundsStore = defineStore('sounds', {
 			leave: null,
 			wait: null,
 		},
+		audioOutputDeviceId: undefined,
 	}),
 
 	actions: {
@@ -123,6 +124,7 @@ export const useSoundsStore = defineStore('sounds', {
 			} catch (error) {
 				console.error(error)
 			}
+			this.audioOutputDeviceId = deviceId
 		},
 	},
 })

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ export const useDevices = createSharedComposable(function() {`
`200`	`200`	`updateAudioStream()`
`201`	`201`	`updateVideoStream()`
`202`	`202`
`203`		`- if (mediaDevicesManager.attributes.audioOutputId !== undefined) {`
	`203`	`+ if (mediaDevicesManager.attributes.audioOutputId !== soundsStore.audioOutputDeviceId) {`
`204`	`204`	`soundsStore.setGeneralAudioOutput(mediaDevicesManager.attributes.audioOutputId)`
`205`	`205`	`}`
`206`	`206`	`}`