Merge branch 'development' into musicman-use-after-free

HeliumAnt · web-flow · commit 8cdb2ccf3535 · 2024-12-19T21:02:00.000+01:00
diff --git a/Source/Entities/DynamicSong.cpp b/Source/Entities/DynamicSong.cpp
@@ -162,14 +162,15 @@ SoundContainer& DynamicSongSection::SelectTransitionSoundContainer() {
 		}
 	}
 
+	RTEAssert(!m_TransitionSoundContainers.empty(), "Tried to get a transition SoundContainer from a DynamicSongSection with none to choose from!");
 	return m_TransitionSoundContainers[0];
 }
 
 SoundContainer& DynamicSongSection::SelectSoundContainer() {
 	RTEAssert(!m_SoundContainers.empty(), "Tried to get a SoundContainer from a DynamicSongSection with none to choose from!");
 	
 	// Shuffle between our options if we have multiple
-	if (m_SoundContainers.size() != 1) {
+	if (m_SoundContainers.size() > 1) {
 		if (m_ShuffleUnplayedIndices.empty()) {
 			for (unsigned int i = 0; i < m_SoundContainers.size(); i++) {
 				if (i != m_LastSoundContainerIndex) {

Original file line number	Diff line number	Diff line change
`@@ -162,14 +162,15 @@ SoundContainer& DynamicSongSection::SelectTransitionSoundContainer() {`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
	`165`	`+ RTEAssert(!m_TransitionSoundContainers.empty(), "Tried to get a transition SoundContainer from a DynamicSongSection with none to choose from!");`
`165`	`166`	`return m_TransitionSoundContainers[0];`
`166`	`167`	`}`
`167`	`168`
`168`	`169`	`SoundContainer& DynamicSongSection::SelectSoundContainer() {`
`169`	`170`	`RTEAssert(!m_SoundContainers.empty(), "Tried to get a SoundContainer from a DynamicSongSection with none to choose from!");`
`170`	`171`
`171`	`172`	`// Shuffle between our options if we have multiple`
`172`		`- if (m_SoundContainers.size() != 1) {`
	`173`	`+ if (m_SoundContainers.size() > 1) {`
`173`	`174`	`if (m_ShuffleUnplayedIndices.empty()) {`
`174`	`175`	`for (unsigned int i = 0; i < m_SoundContainers.size(); i++) {`
`175`	`176`	`if (i != m_LastSoundContainerIndex) {`