change how these are compared by putting the load in the condition too

This commit is contained in:
AJ Kelly
2011-03-29 23:50:41 -05:00
parent 53dea206f4
commit b91dc69043
+4 -4
View File
@@ -142,9 +142,9 @@ static void StartMusic( MusicToPlay &ToPlay )
{
LOG->Trace( "Found '%s'", ToPlay.m_sTimingFile.c_str() );
Song song;
if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".ssc" )
if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".ssc" &&
SSCLoader::LoadFromSSCFile(ToPlay.m_sTimingFile, song) )
{
SSCLoader::LoadFromSSCFile(ToPlay.m_sTimingFile, song);
ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_Timing;
// get cabinet lights if any
@@ -152,9 +152,9 @@ static void StartMusic( MusicToPlay &ToPlay )
if( pStepsCabinetLights )
pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData );
}
else if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".sm" )
else if( GetExtension(ToPlay.m_sTimingFile.c_str()) == ".sm" &&
SMLoader::LoadFromSMFile(ToPlay.m_sTimingFile, song) )
{
SMLoader::LoadFromSMFile(ToPlay.m_sTimingFile, song);
ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_Timing;
// get cabinet lights if any