actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

editor: fix crash on revert from disk

Browse Source 
This still doesn't read in the timing data from disk, but hey, at least it
doesn't crash now.
This commit is contained in:
Devin J. Pohly
2013-08-13 11:43:31 -04:00
parent 2ec80d86b1
commit fca57e2569
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+8 -1
View File
@@ -362,6 +362,9 @@ bool Song::LoadFromSongDir( RString sDir )
return true; // do load this song return true; // do load this song
} }
/* This function feels EXTREMELY hacky - copying things on top of pointers so
* they don't break elsewhere. Maybe it could be rewritten to politely ask the
* Song/Steps objects to reload themselves. -- djpohly */
bool Song::ReloadFromSongDir( RString sDir ) bool Song::ReloadFromSongDir( RString sDir )
{ {
RemoveAutoGenNotes(); RemoveAutoGenNotes();
@@ -373,10 +376,14 @@ bool Song::ReloadFromSongDir( RString sDir )
copy.RemoveAutoGenNotes(); copy.RemoveAutoGenNotes();
*this = copy; *this = copy;
// First we assemble a map to let us easily find the new steps /* Go through the steps, first setting their Song pointer to this song
* (instead of the copy used above), and constructing a map to let us
* easily find the new steps. */
map<StepsID, Steps*> mNewSteps; map<StepsID, Steps*> mNewSteps;
for( vector<Steps*>::const_iterator it = m_vpSteps.begin(); it != m_vpSteps.end(); ++it ) for( vector<Steps*>::const_iterator it = m_vpSteps.begin(); it != m_vpSteps.end(); ++it )
{ {
(*it)->m_pSong = this;
StepsID id; StepsID id;
id.FromSteps( *it ); id.FromSteps( *it );
mNewSteps[id] = *it; mNewSteps[id] = *it;