Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: prevent race condition in audio output source switching by reading from in-memory state with proper synchronization

This commit is contained in:
Alex P 2025-10-28 22:11:11 +02:00
parent cd7a098f76
commit 65bbcf85ad
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio.go
View File

@ -176,6 +176,7 @@ func SetAudioOutputSource(useUSB bool) error {
Bool("new_usb", useUSB). Bool("new_usb", useUSB).
Msg("Switching audio output source") Msg("Switching audio output source")
oldValue := useUSBForAudioOutput
useUSBForAudioOutput = useUSB useUSBForAudioOutput = useUSB
ensureConfigLoaded() ensureConfigLoaded()
@ -186,6 +187,7 @@ func SetAudioOutputSource(useUSB bool) error {
} }
if err := SaveConfig(); err != nil { if err := SaveConfig(); err != nil {
audioLogger.Error().Err(err).Msg("Failed to save config") audioLogger.Error().Err(err).Msg("Failed to save config")
useUSBForAudioOutput = oldValue
return err return err
} }

9
jsonrpc.go
View File

@ -970,8 +970,13 @@ func rpcSetUsbDeviceState(device string, enabled bool) error {
} }
func rpcGetAudioOutputSource() (string, error) { func rpcGetAudioOutputSource() (string, error) {
ensureConfigLoaded() audioMutex.Lock()
return config.AudioOutputSource, nil defer audioMutex.Unlock()
if useUSBForAudioOutput {
return "usb", nil
}
return "hdmi", nil
} }
func rpcSetAudioOutputSource(source string) error { func rpcSetAudioOutputSource(source string) error {