Fix crash when switching sound to stSimulatingLooped state while ther…

…e's prefill task active (fixes OpenXRay#1640) Addition to 958757e
Masterkatze · Mar 23, 2024 · 2c231d7 · 2c231d7
1 parent 3fc4188
commit 2c231d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/xrSound/SoundRender_Emitter_FSM.cpp b/src/xrSound/SoundRender_Emitter_FSM.cpp
@@ -184,8 +184,8 @@ void CSoundRender_Emitter::update(float fTime, float dt)
         if (!update_culling(dt))
         {
             // switch to: SIMULATE
-            m_current_state = stSimulatingLooped; // switch state
             SoundRender->i_stop(this);
+            m_current_state = stSimulatingLooped; // switch state
         }
         else
         {

diff --git a/src/xrSound/SoundRender_Emitter_StartStop.cpp b/src/xrSound/SoundRender_Emitter_StartStop.cpp
@@ -86,13 +86,13 @@ void CSoundRender_Emitter::cancel()
     {
     case stPlaying:
         // switch to: SIMULATE
-        m_current_state = stSimulating; // switch state
         SoundRender->i_stop(this);
+        m_current_state = stSimulating; // switch state
         break;
     case stPlayingLooped:
         // switch to: SIMULATE
-        m_current_state = stSimulatingLooped; // switch state
         SoundRender->i_stop(this);
+        m_current_state = stSimulatingLooped; // switch state
         break;
     default: FATAL("Non playing ref_sound forced out of render queue"); break;
     }