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

fix crash on exit editor

Browse Source 
move management of Song resources out of Song and into SongManager
This commit is contained in:
Chris Danford
2004-08-11 08:23:14 +00:00
parent 09d8807927
commit 13dd1a9bda
6 changed files with 73 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+2 -2
View File
@@ -1336,7 +1336,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
{
case SM_GoToNextScreen:
// Reload song from disk to discard changes.
GAMESTATE->m_pCurSong->RevertFromDisk( true );
SONGMAN->RevertFromDisk( GAMESTATE->m_pCurSong, true );
/* We might do something with m_pSteps (eg. UpdateTextInfo) before we end up
* in ScreenEditMenu, and m_pSteps might be invalid due to RevertFromDisk. */
m_pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
@@ -1411,7 +1411,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
id.FromSteps( m_pSteps );
GAMESTATE->m_pCurSteps[PLAYER_1] = NULL; /* make RevertFromDisk not try to reset it */
GAMESTATE->m_pCurSong->RevertFromDisk();
SONGMAN->RevertFromDisk( GAMESTATE->m_pCurSong );
CString sMessage = "Reloaded from disk.";
Steps *pSteps = id.ToSteps( GAMESTATE->m_pCurSong, false );