Use an intrusive_ptr for ALeffectslotProps::State

2 files changed, 2 insertions, 4 deletions

diff --git a/alc/alc.cpp b/alc/alc.cpp
index c349a4ba..edefe9a1 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -2353,7 +2353,6 @@ ALCcontext::~ALCcontext()
     while(eprops)
     {
         ALeffectslotProps *next{eprops->next.load(std::memory_order_relaxed)};
-        if(eprops->State) eprops->State->release();
         delete eprops;
         eprops = next;
         ++count;
diff --git a/alc/alu.cpp b/alc/alu.cpp
index a5172fb7..aed79b14 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -476,8 +476,7 @@ bool CalcEffectSlotParams(ALeffectslot *slot, ALeffectslot **sorted_slots, ALCco
         slot->Params.AirAbsorptionGainHF = 1.0f;
     }
 
-    EffectState *state{props->State};
-    props->State = nullptr;
+    EffectState *state{props->State.release()};
     EffectState *oldstate{slot->Params.mEffectState};
     slot->Params.mEffectState = state;
 
@@ -502,7 +501,7 @@ bool CalcEffectSlotParams(ALeffectslot *slot, ALeffectslot **sorted_slots, ALCco
              * cleaned up sometime later (not ideal, but better than blocking
              * or leaking).
              */
-            props->State = oldstate;
+            props->State.reset(oldstate);
         }
     }