Don't leave decoderState null after processing cancelations (#710)

sbooth · web-flow · commit f201b1fcb875 · 2025-12-30T18:03:22.000-06:00
diff --git a/Sources/CSFBAudioEngine/Player/AudioPlayer.mm b/Sources/CSFBAudioEngine/Player/AudioPlayer.mm
@@ -993,7 +993,6 @@ bool PerformSeek() noexcept
 		DecoderState *decoderState = nullptr;
 		auto ringBufferStale = false;
 
-		// Get the earliest decoder state that has not completed rendering
 		{
 			std::lock_guard lock{activeDecodersLock_};
 			decoderState = FirstDecoderStateWithRenderingNotComplete();
@@ -1015,6 +1014,9 @@ bool PerformSeek() noexcept
 
 				decoderState = FirstDecoderStateFollowingSequenceNumberWithRenderingNotComplete(decoderState->sequenceNumber_);
 			}
+
+			// Get the earliest decoder state that has not completed rendering
+			decoderState = FirstDecoderStateWithRenderingNotComplete();
 		}
 
 		// Process pending seeks

Original file line number	Diff line number	Diff line change
`@@ -993,7 +993,6 @@ bool PerformSeek() noexcept`
`993`	`993`	`DecoderState *decoderState = nullptr;`
`994`	`994`	`auto ringBufferStale = false;`
`995`	`995`
`996`		`- // Get the earliest decoder state that has not completed rendering`
`997`	`996`	`{`
`998`	`997`	`std::lock_guard lock{activeDecodersLock_};`
`999`	`998`	`decoderState = FirstDecoderStateWithRenderingNotComplete();`
`@@ -1015,6 +1014,9 @@ bool PerformSeek() noexcept`
`1015`	`1014`
`1016`	`1015`	`decoderState = FirstDecoderStateFollowingSequenceNumberWithRenderingNotComplete(decoderState->sequenceNumber_);`
`1017`	`1016`	`}`
	`1017`	`+`
	`1018`	`+ // Get the earliest decoder state that has not completed rendering`
	`1019`	`+ decoderState = FirstDecoderStateWithRenderingNotComplete();`
`1018`	`1020`	`}`
`1019`	`1021`
`1020`	`1022`	`// Process pending seeks`