From 425ff7cb00c3666e87ec5dbdbf3a65c9a77d9266 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 15 Feb 2012 11:28:19 -0800 Subject: [PATCH] Combine a couple if checks --- Alc/ALc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index 6f64fe19..aac7b6d3 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -1189,19 +1189,15 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList) } device->Flags |= DEVICE_RUNNING; - if(device->FmtChans != oldChans) + if(device->FmtChans != oldChans && (device->Flags&DEVICE_CHANNELS_REQUEST)) { - if((device->Flags&DEVICE_CHANNELS_REQUEST)) - ERR("Failed to set %s, got %s instead\n", - DevFmtChannelsString(oldChans), - DevFmtChannelsString(device->FmtChans)); + ERR("Failed to set %s, got %s instead\n", DevFmtChannelsString(oldChans), + DevFmtChannelsString(device->FmtChans)); device->Flags &= ~DEVICE_CHANNELS_REQUEST; } - if(device->Frequency != oldFreq) + if(device->Frequency != oldFreq && (device->Flags&DEVICE_FREQUENCY_REQUEST)) { - if((device->Flags&DEVICE_FREQUENCY_REQUEST)) - ERR("Failed to set %uhz, got %uhz instead\n", - oldFreq, device->Frequency); + ERR("Failed to set %uhz, got %uhz instead\n", oldFreq, device->Frequency); device->Flags &= ~DEVICE_FREQUENCY_REQUEST; } -- 2.11.4.GIT