fix crash in NotesLoaderBMS

2011-05-24 11:12:47 +07:00
parent e7df4edbe1
commit 0994bd64bc
1 changed files with 6 additions and 3 deletions
@@ -1183,14 +1183,17 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
 		Steps* pNewNotes = apSteps[i];
 		const bool ok = LoadFromBMSFile( out.GetSongDir() + arrayBMSFileNames[i], aBMSData[i], *pNewNotes, out, mapFilenameToKeysoundIndex );
 		if( ok )
+		{
+			// set song's timing data to the main file.
+			if( i == iMainDataIndex )
+				out.m_SongTiming = pNewNotes->m_Timing;
+				
 			out.AddSteps( pNewNotes );
+		}
 		else
 			delete pNewNotes;
 	}

-	// set song's timing data to the main file.
-	out.m_SongTiming = apSteps[iMainDataIndex]->m_Timing;
-
 	SlideDuplicateDifficulties( out );

 	ConvertString( out.m_sMainTitle, "utf-8,japanese" );