2 files changed, 19 insertions, 12 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 0019de9e..86b8e59e 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -2266,6 +2266,8 @@ static ALvoid InitContext(ALCcontext *Context)
     ATOMIC_INIT(&listener->FreeList, NULL);
 
     //Validate Context
+    InitRef(&Context->UpdateCount, 0);
+    ATOMIC_INIT(&Context->HoldUpdates, AL_FALSE);
     RWLockInit(&Context->PropLock);
     ATOMIC_INIT(&Context->LastError, AL_NO_ERROR);
     InitUIntMap(&Context->SourceMap, Context->Device->MaxNoOfSources);
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 329d01eb..34c36d5b 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -1339,26 +1339,31 @@ ALvoid CalcAttnSourceParams(ALvoice *voice, const struct ALsourceProps *props, c
 }
 
 
-void UpdateContextSources(ALCcontext *ctx)
+static void UpdateContextSources(ALCcontext *ctx)
 {
     ALvoice *voice, *voice_end;
     ALsource *source;
 
-    CalcListenerParams(ctx);
+    IncrementRef(&ctx->UpdateCount);
+    if(!ATOMIC_LOAD(&ctx->HoldUpdates))
+    {
+        CalcListenerParams(ctx);
 #define UPDATE_SLOT(iter) CalcEffectSlotParams(*iter, ctx->Device)
-    VECTOR_FOR_EACH(ALeffectslot*, ctx->ActiveAuxSlots, UPDATE_SLOT);
+        VECTOR_FOR_EACH(ALeffectslot*, ctx->ActiveAuxSlots, UPDATE_SLOT);
 #undef UPDATE_SLOT
 
-    voice = ctx->Voices;
-    voice_end = voice + ctx->VoiceCount;
-    for(;voice != voice_end;++voice)
-    {
-        if(!(source=voice->Source)) continue;
-        if(source->state != AL_PLAYING && source->state != AL_PAUSED)
-            voice->Source = NULL;
-        else
-            CalcSourceParams(voice, ctx);
+        voice = ctx->Voices;
+        voice_end = voice + ctx->VoiceCount;
+        for(;voice != voice_end;++voice)
+        {
+            if(!(source=voice->Source)) continue;
+            if(source->state != AL_PLAYING && source->state != AL_PAUSED)
+                voice->Source = NULL;
+            else
+                CalcSourceParams(voice, ctx);
+        }
     }
+    IncrementRef(&ctx->UpdateCount);
 }