From 961433cdef571ad2ef194eca13906d36e6731dd6 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 26 Mar 2010 00:45:29 -0500 Subject: [PATCH] Fix a crash caused when switching themes in-game. Technical reason: It was choking on the song group colors, which weren't reloaded on theme switch before. --- src/SongManager.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/SongManager.cpp b/src/SongManager.cpp index 9127bbbba2..7a6ad91ba0 100644 --- a/src/SongManager.cpp +++ b/src/SongManager.cpp @@ -126,6 +126,13 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld ) PREFSMAN->m_bFastLoad.Set( OldVal ); UpdatePreferredSort(); + + // Reload song/course group colors to prevent a crash when switching + // themes in-game. -aj + NUM_SONG_GROUP_COLORS .Load( "SongManager", "NumSongGroupColors" ); + SONG_GROUP_COLOR .Load( "SongManager", SONG_GROUP_COLOR_NAME, NUM_SONG_GROUP_COLORS ); + NUM_COURSE_GROUP_COLORS .Load( "SongManager", "NumCourseGroupColors" ); + COURSE_GROUP_COLOR .Load( "SongManager", COURSE_GROUP_COLOR_NAME, NUM_COURSE_GROUP_COLORS ); } void SongManager::InitSongsFromDisk( LoadingWindow *ld )