fix nonstop showing in menus when it shouldn't

stepmania/src/MusicWheel.cpp

@@ -81,8 +81,17 @@ static const SongSortOrder SortOrder[] =
 };
 // use ARRAYSIZE(SortOrder)
 
-
 MusicWheel::MusicWheel() 
+{
+	// update theme metric cache
+	SWITCH_SECONDS.Refresh();
+	ITEM_CURVE_X.Refresh();
+	ITEM_SPACING_Y.Refresh();
+	USE_3D.Refresh();
+	NUM_WHEEL_ITEMS_METRIC.Refresh();
+}
+
+void MusicWheel::Load() 
 { 
 	LOG->Trace( "MusicWheel::MusicWheel()" );
 	if (GAMESTATE->m_pCurSong != NULL)
@@ -92,13 +101,6 @@ MusicWheel::MusicWheel()
 
 	SONGMAN->UpdateRankingCourses();
 
-	// update theme metric cache
-	SWITCH_SECONDS.Refresh();
-	ITEM_CURVE_X.Refresh();
-	ITEM_SPACING_Y.Refresh();
-	USE_3D.Refresh();
-	NUM_WHEEL_ITEMS_METRIC.Refresh();
-
 	if( USE_3D )
 	{
 		WHEEL_3D_RADIUS.Refresh();

stepmania/src/MusicWheel.h

@@ -42,6 +42,7 @@ class MusicWheel : public ActorFrame
 public:
 	MusicWheel();
 	~MusicWheel();
+	void Load();
 
 	virtual void Update( float fDeltaTime );
 	virtual void DrawPrimitives();

stepmania/src/ScreenSelectCourse.cpp

@@ -67,6 +67,8 @@ ScreenSelectCourse::ScreenSelectCourse( CString sClassName ) : Screen( sClassNam
  
 	SOUND->PlayMusic( THEME->GetPathToS("ScreenSelectCourse music") );
 
+	m_MusicWheel.Load();
+
 	m_bMadeChoice = false;
 	m_bGoToOptions = false;
 	m_bAllowOptionsMenuRepeat = false;

stepmania/src/ScreenSelectMusic.cpp

@@ -86,7 +86,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
 
 	m_bInCourseDisplayMode = GAMESTATE->IsCourseMode();
 
-	/* Finish any previous stage.  It's OK to call this when we havn't played a stage yet. */
+	/* Finish any previous stage.  It's OK to call this when we havn't played a stage yet. 
+	 * Do this before anything that might look at GAMESTATE->m_iCurrentStageIndex. */
 	GAMESTATE->FinishStage();
 
 	/* Cache: */
@@ -100,6 +101,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName
 
 	CodeDetector::RefreshCacheItems();
 
+	m_MusicWheel.Load();
+
 	int p;
 
 	m_Menu.Load( "ScreenSelectMusic" );