From 249afde5f9363384649fc3993bde9dc26c75df4c Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 13 Jul 2017 22:33:13 -0700
Subject: Initialize the default effect after device update

---
 Alc/ALc.c | 66 ++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

(limited to 'Alc/ALc.c')

diff --git a/Alc/ALc.c b/Alc/ALc.c
index e4b57c45..ece66273 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -3617,33 +3617,10 @@ ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCin
     ATOMIC_INIT(&ALContext->ActiveAuxSlots, NULL);
     ALContext->Device = device;
 
-    if(DefaultEffect.type != AL_EFFECT_NULL)
-    {
-        ALContext->DefaultSlot = (ALeffectslot*)(ALContext->_listener_mem + sizeof(ALlistener));
-        if(InitEffectSlot(ALContext->DefaultSlot) != AL_NO_ERROR)
-        {
-            ALContext->DefaultSlot = NULL;
-            ERR("Failed to initialize the default effect slot\n");
-        }
-        else
-        {
-            aluInitEffectPanning(ALContext->DefaultSlot);
-            if(InitializeEffect(device, ALContext->DefaultSlot, &DefaultEffect) != AL_NO_ERROR)
-            {
-                DeinitEffectSlot(ALContext->DefaultSlot);
-                ALContext->DefaultSlot = NULL;
-                ERR("Failed to initialize the default effect\n");
-            }
-        }
-    }
-
     if((err=UpdateDeviceParams(device, attrList)) != ALC_NO_ERROR)
     {
         almtx_unlock(&device->BackendLock);
 
-        al_free(ALContext->Voices);
-        ALContext->Voices = NULL;
-
         al_free(ALContext);
         ALContext = NULL;
 
@@ -3659,22 +3636,41 @@ ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCin
     }
     AllocateVoices(ALContext, 256, device->NumAuxSends);
 
-    if(ALContext->DefaultSlot)
+    if(DefaultEffect.type != AL_EFFECT_NULL && device->Type == Playback)
     {
-        ALeffectslot *slot = ALContext->DefaultSlot;
-        ALeffectState *state = slot->Effect.State;
-
-        START_MIXER_MODE();
-        state->OutBuffer = device->Dry.Buffer;
-        state->OutChannels = device->Dry.NumChannels;
-        if(V(state,deviceUpdate)(device) != AL_FALSE)
-            UpdateEffectSlotProps(slot);
-        else
+        ALContext->DefaultSlot = (ALeffectslot*)(ALContext->_listener_mem + sizeof(ALlistener));
+        if(InitEffectSlot(ALContext->DefaultSlot) != AL_NO_ERROR)
         {
-            DeinitEffectSlot(ALContext->DefaultSlot);
             ALContext->DefaultSlot = NULL;
+            ERR("Failed to initialize the default effect slot\n");
+        }
+        else
+        {
+            aluInitEffectPanning(ALContext->DefaultSlot);
+            if(InitializeEffect(device, ALContext->DefaultSlot, &DefaultEffect) != AL_NO_ERROR)
+            {
+                DeinitEffectSlot(ALContext->DefaultSlot);
+                ALContext->DefaultSlot = NULL;
+                ERR("Failed to initialize the default effect\n");
+            }
+        }
+        if(ALContext->DefaultSlot)
+        {
+            ALeffectslot *slot = ALContext->DefaultSlot;
+            ALeffectState *state = slot->Effect.State;
+
+            START_MIXER_MODE();
+            state->OutBuffer = device->Dry.Buffer;
+            state->OutChannels = device->Dry.NumChannels;
+            if(V(state,deviceUpdate)(device) != AL_FALSE)
+                UpdateEffectSlotProps(slot);
+            else
+            {
+                DeinitEffectSlot(ALContext->DefaultSlot);
+                ALContext->DefaultSlot = NULL;
+            }
+            END_MIXER_MODE();
         }
-        END_MIXER_MODE();
     }
 
     ALCdevice_IncRef(ALContext->Device);
-- 
cgit v1.2.3