diff --git a/src/NotesLoaderDWI.cpp b/src/NotesLoaderDWI.cpp index bd4e2314fe..1c50103288 100644 --- a/src/NotesLoaderDWI.cpp +++ b/src/NotesLoaderDWI.cpp @@ -656,7 +656,7 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set &Bla // do nothing. We don't care about this value name } } - + out.TidyUpData(); return true; } diff --git a/src/NotesLoaderKSF.cpp b/src/NotesLoaderKSF.cpp index 385a5152fa..276f0c1e49 100644 --- a/src/NotesLoaderKSF.cpp +++ b/src/NotesLoaderKSF.cpp @@ -702,6 +702,7 @@ bool KSFLoader::LoadFromDir( const RString &sDir, Song &out ) out.AddSteps( pNewNotes ); } + out.TidyUpData(); return true; } diff --git a/src/NotesLoaderMidi.cpp b/src/NotesLoaderMidi.cpp index ef354d7bfe..9673cdb14d 100644 --- a/src/NotesLoaderMidi.cpp +++ b/src/NotesLoaderMidi.cpp @@ -883,7 +883,7 @@ skip_track: pSteps->SetNoteData( noteData ); songOut.AddSteps( pSteps ); } - + return true; } @@ -956,6 +956,7 @@ bool MidiLoader::LoadFromDir( const RString &sDir, Song &out ) if( !LoadFromMidi(sDir+vsFiles[0], out) ) return false; + out.TidyUpData(); return true; } diff --git a/src/NotesLoaderPMS.cpp b/src/NotesLoaderPMS.cpp index 44578f6504..f9ef5bf1cc 100644 --- a/src/NotesLoaderPMS.cpp +++ b/src/NotesLoaderPMS.cpp @@ -940,7 +940,7 @@ bool PMSLoader::LoadFromDir( const RString &sDir, Song &out ) ConvertString( out.m_sArtist, "utf-8,japanese" ); ConvertString( out.m_sGenre, "utf-8,japanese" ); - + out.TidyUpData(); return true; } diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp index cd1fc8d52e..a456a6fab1 100644 --- a/src/NotesLoaderSM.cpp +++ b/src/NotesLoaderSM.cpp @@ -753,7 +753,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache else LOG->UserLog( "Song file", sPath, "has an unexpected value named \"%s\".", sValueName.c_str() ); } - + TidyUpData( out, bFromCache ); return true; } @@ -946,6 +946,7 @@ void SMLoader::TidyUpData( Song &song, bool bFromCache ) bg.push_back( BackgroundChange(song.m_fLastBeat,song.m_sBackgroundFile) ); } while(0); } + song.TidyUpData(); } /* diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index 6a723201ab..8caba0a62b 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -711,7 +711,8 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out ) else LOG->UserLog( "Song file", sPath, "has an unexpected value named \"%s\".", sValueName.c_str() ); } - + TidyUpData(out, false); + out.TidyUpData(); return true; } diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp index c4f379c57e..81969e336e 100644 --- a/src/NotesLoaderSSC.cpp +++ b/src/NotesLoaderSSC.cpp @@ -625,6 +625,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach } } out.m_fVersion = STEPFILE_VERSION_NUMBER; + TidyUpData(out, bFromCache); return true; }