Use an intrusive_ptr to hold on to the EffectState

1 files changed, 3 insertions, 5 deletions

diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index 0f0a20f8..5f58d730 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -917,7 +917,7 @@ ALeffectslot::ALeffectslot(ALCcontext *context)
 
     mSlot = context->getEffectSlot();
     mSlot->InUse = true;
-    mSlot->mEffectState = state.release();
+    mSlot->mEffectState = std::move(state);
 }
 
 ALeffectslot::~ALeffectslot()
@@ -929,16 +929,14 @@ ALeffectslot::~ALeffectslot()
         DecrementRef(Buffer->ref);
     Buffer = nullptr;
 
-    EffectSlotProps *props{mSlot->Update.exchange(nullptr)};
-    if(props)
+    if(EffectSlotProps *props{mSlot->Update.exchange(nullptr)})
     {
         TRACE("Freed unapplied AuxiliaryEffectSlot update %p\n",
             decltype(std::declval<void*>()){props});
         delete props;
     }
 
-    if(mSlot->mEffectState)
-        mSlot->mEffectState->release();
+    mSlot->mEffectState = nullptr;
     mSlot->InUse = false;
 }