partial fix: don't load into an already-loaded song

2006-11-12 03:38:57 +00:00
parent c6e62ae92d
commit 3961ea4c2d
1 changed files with 4 additions and 1 deletions
@@ -3448,7 +3448,10 @@ void ScreenEdit::RevertFromDisk()
 		id.FromSteps( GAMESTATE->m_pCurSteps[PLAYER_1] );

 	RString sSongDir = GAMESTATE->m_pCurSong->GetSongDir();
-	GAMESTATE->m_pCurSong->LoadFromSongDir( sSongDir );
+	Song s;
+	s.LoadFromSongDir( sSongDir );
+	*GAMESTATE->m_pCurSong = s;
+	s.DetachSteps();

 	if( id.IsValid() )
 		GAMESTATE->m_pCurSteps[PLAYER_1].Set( id.ToSteps( GAMESTATE->m_pCurSong, false ) );