From 14b91aea37769852a96a9fa7d13391d2101f56e0 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 2 Jul 2006 22:02:59 +0000 Subject: [PATCH] Don't add random entries (pSong = NULL) to vSongs. Assert that pSong is never NULL. --- stepmania/src/ScreenJukebox.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 23bf343cf8..d749378d8e 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -37,7 +37,8 @@ void ScreenJukebox::SetSong() Course *pCourse = SONGMAN->GetCourseFromName( THEME->GetCurThemeName() ); if( pCourse != NULL ) for ( unsigned i = 0; i < pCourse->m_vEntries.size(); i++ ) - vSongs.push_back( pCourse->m_vEntries[i].pSong ); + if( pCourse->m_vEntries[i].IsFixedSong() ) + vSongs.push_back( pCourse->m_vEntries[i].pSong ); if ( vSongs.size() == 0 ) SONGMAN->GetSongs( vSongs, GAMESTATE->m_sPreferredSongGroup ); @@ -78,6 +79,7 @@ void ScreenJukebox::SetSong() Song* pSong = vSongs[RandomInt(vSongs.size())]; + ASSERT( pSong != NULL ); if( !pSong->HasMusic() ) continue; // skip if( UNLOCKMAN->SongIsLocked(pSong) )