1 files changed, 9 insertions, 2 deletions
diff --git a/al/error.cpp b/al/error.cpp
index e33ee161..8e6bb3b8 100644
--- a/al/error.cpp
+++ b/al/error.cpp
@@ -90,9 +90,12 @@ void ALCcontext::setError(ALenum errorCode, const char *msg, ...)
     debugMessage(DebugSource::API, DebugType::Error, 0, DebugSeverity::High, msglen, msg);
 }
 
-AL_API DECL_FUNC(ALenum, alGetError)
-FORCE_ALIGN ALenum AL_APIENTRY alGetErrorDirect(ALCcontext *context) noexcept
+/* Special-case alGetError since it (potentially) raises a debug signal and
+ * returns a non-default value for a null context.
+ */
+AL_API ALenum AL_APIENTRY alGetError(void) START_API_FUNC
 {
+    auto context = GetContextRef();
     if(!context) UNLIKELY
     {
         static constexpr ALenum deferror{AL_INVALID_OPERATION};
@@ -108,6 +111,10 @@ FORCE_ALIGN ALenum AL_APIENTRY alGetErrorDirect(ALCcontext *context) noexcept
         }
         return deferror;
     }
+    return alGetErrorDirect(context.get());
+} END_API_FUNC
 
+FORCE_ALIGN ALenum AL_APIENTRY alGetErrorDirect(ALCcontext *context) noexcept
+{
     return context->mLastError.exchange(AL_NO_ERROR);
 }