From 97abd25e3e40be76c058d3e795b3543e476b4062 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 19 Jun 2011 16:51:51 -0400 Subject: [PATCH] Fix Practice Songs crash with AdditionalSongs. --- Docs/Changelog_sm5.txt | 5 +++++ src/EditMenu.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 26f2c988c0..254e40a4ce 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,11 @@ ________________________________________________________________________________ StepMania 5.0 Preview 2 | 201106?? -------------------------------------------------------------------------------- +2011/06/19 +* [EditMenu] Allow all songs to work in Practice Mode, regardless of folder + location. This fixes a crash if everyone had songs in AdditionalSongs. + [Wolfman2000] + 2011/06/17 ---------- * [LifeMeterBattery] Fixed a bug where MinesSubtractLives was not being honored. diff --git a/src/EditMenu.cpp b/src/EditMenu.cpp index 8b39585144..274ff975b8 100644 --- a/src/EditMenu.cpp +++ b/src/EditMenu.cpp @@ -60,7 +60,7 @@ void EditMenu::GetSongsToShowForGroup( const RString &sGroup, vector &vpS for( int i=vpSongsOut.size()-1; i>=0; i-- ) { const Song* pSong = vpSongsOut[i]; - if( !pSong->NormallyDisplayed() || pSong->IsTutorial() || SONGMAN->WasLoadedFromAdditionalSongs(pSong) ) + if( !pSong->NormallyDisplayed() || pSong->IsTutorial() ) vpSongsOut.erase( vpSongsOut.begin()+i ); } break;