aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2013-12-23 23:42:21 -0800
committerChris Robinson <[email protected]>2013-12-23 23:42:21 -0800
commitb0878fe60962212614d251815e533b0e0a704989 (patch)
tree58064138f52808a7474cdc7845838520f20206b4
parentc911ca89a328438aa5d654ed35e587d271641e97 (diff)
Do not accept preset or instrument ID 0 as valid
-rw-r--r--OpenAL32/alInstrument.c3
-rw-r--r--OpenAL32/alPreset.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenAL32/alInstrument.c b/OpenAL32/alInstrument.c
index dfcb93ba..5ab2fef2 100644
--- a/OpenAL32/alInstrument.c
+++ b/OpenAL32/alInstrument.c
@@ -109,8 +109,7 @@ AL_API ALboolean AL_APIENTRY alIsInstrumentSOFT(ALuint id)
context = GetContextRef();
if(!context) return AL_FALSE;
- ret = ((!id || LookupInstrument(context->Device, id)) ?
- AL_TRUE : AL_FALSE);
+ ret = LookupInstrument(context->Device, id) ? AL_TRUE : AL_FALSE;
ALCcontext_DecRef(context);
diff --git a/OpenAL32/alPreset.c b/OpenAL32/alPreset.c
index c01f4e80..9e4eed4f 100644
--- a/OpenAL32/alPreset.c
+++ b/OpenAL32/alPreset.c
@@ -109,8 +109,7 @@ AL_API ALboolean AL_APIENTRY alIsPresetSOFT(ALuint id)
context = GetContextRef();
if(!context) return AL_FALSE;
- ret = ((!id || LookupPreset(context->Device, id)) ?
- AL_TRUE : AL_FALSE);
+ ret = LookupPreset(context->Device, id) ? AL_TRUE : AL_FALSE;
ALCcontext_DecRef(context);