source/frontend/options.cpp

@@ -487,7 +487,7 @@ void CFrontEndOptions::select()
 	m_closingDown=false;
 
 	CSoundMediator::setSong(CSoundMediator::SONG_OPTIONS);
-	CSoundMediator::playSong();
+	m_musicStarted=false;
 	
 	CFader::setFadingIn();
 }
@@ -578,6 +578,12 @@ void CFrontEndOptions::think(int _frames)
 
 	if(!CFader::isFading())
 	{
+		if(!m_musicStarted)
+		{
+			CSoundMediator::playSong();
+			m_musicStarted=true;
+		}
+
 		if(m_nextMode!=m_mode)
 		{
 			if(m_nextMode==MODE__LOAD)

source/frontend/options.h

@@ -154,6 +154,8 @@ private:
 	int							m_screenXOff;
 	int							m_screenYOff;
 
+	int							m_musicStarted;
+
 	static int									s_controlStyleValues[];
 	static CGUITextReadout::TextReadoutData		s_controlStyleReadoutText[];
 

source/frontend/start.cpp

@@ -198,7 +198,7 @@ void CFrontEndStart::select()
 	m_slotDrawOffset=0;
 
 	CSoundMediator::setSong(CSoundMediator::SONG_MEMCARD2);
-	CSoundMediator::playSong();
+	m_musicStarted=false;
 }
 
 /*----------------------------------------------------------------------
@@ -409,6 +409,12 @@ void CFrontEndStart::think(int _frames)
 {
 	if(!CFader::isFading())
 	{
+		if(!m_musicStarted)
+		{
+			CSoundMediator::playSong();
+			m_musicStarted=true;
+		}
+
 		if(m_slotDrawOffset==0)
 		{
 			if(m_state==STATE_SELECT)

source/frontend/start.h

@@ -114,6 +114,8 @@ private:
 
 	static const int		s_itemFrames[];
 
+	int						m_musicStarted;
+
 
 };