From 5d8a1c11b5f524b645b829838580472ea4e6eb09 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 5 Sep 2015 14:22:19 -0700 Subject: Avoid setting an HRTF-compatible format when it's disabled --- Alc/ALc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index 593af3e6..0bce53ac 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -1937,15 +1937,15 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList) ERR("Unexpected hrtf value: %s\n", hrtf); } - if(hrtf_userreq == Hrtf_Enable || hrtf_appreq == Hrtf_Enable) + if(hrtf_userreq == Hrtf_Enable || (hrtf_userreq != Hrtf_Disable && hrtf_appreq == Hrtf_Enable)) { - if(!FindHrtfFormat(&device->FmtChans, &device->Frequency)) + if(FindHrtfFormat(&device->FmtChans, &device->Frequency)) + device->Flags |= DEVICE_CHANNELS_REQUEST | DEVICE_FREQUENCY_REQUEST; + else { hrtf_userreq = hrtf_appreq = Hrtf_Default; device->Hrtf_Status = ALC_HRTF_UNSUPPORTED_FORMAT_SOFT; } - else - device->Flags |= DEVICE_CHANNELS_REQUEST | DEVICE_FREQUENCY_REQUEST; } } else if(hrtf_appreq == Hrtf_Enable) -- cgit v1.2.3