Make sure the mix is done after setting the looping property

2017-04-02 06:35:44 -07:00
parent d52752a3fe
commit b78ddc7ef7
1 changed files with 9 additions and 0 deletions
@@ -699,6 +699,15 @@ static ALboolean SetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp p

            WriteLock(&Source->queue_lock);
            ATOMIC_STORE_SEQ(&Source->looping, *values);
+            if(ATOMIC_LOAD(&Source->state, almemory_order_acquire) == AL_PLAYING)
+            {
+                /* If the source is playing, wait for the current mix to finish
+                 * to ensure it isn't currently looping back or reaching the
+                 * end.
+                 */
+                while((ATOMIC_LOAD(&device->MixCount, almemory_order_acquire)&1))
+                    althrd_yield();
+            }
            WriteUnlock(&Source->queue_lock);
            return AL_TRUE;