From efc1025583b503467a47c3f66d46d797554c345b Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 21 Jun 2003 03:45:34 +0000
Subject: [PATCH] fix "changes to current Song remain if exit from editor
 without saving"

---
 stepmania/src/ScreenEdit.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index d89999aece..ee048a4c47 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -97,12 +97,6 @@ const CString HELP_TEXT =
 	"F1:\n     Show\n     keyboard\n     shortcuts\n";
 
 
-
-#define E	"                                "	// CHAR[32]
-#define OPTION_NAME_SIZE  sizeof(E)
-#define THIRTY_ES	E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E		// MAX_OPTIONS_PER_LINE == 30
-
-
 Menu g_KeyboardShortcuts
 (
 	"Keyboard Shortcuts",
@@ -143,7 +137,7 @@ Menu g_MainMenu
 	MenuRow( "Add/Edit Stop",				true ),
 	MenuRow( "Add/Edit BG Change",			true ),
 	MenuRow( "Play preview music",			true ),
-	MenuRow( "Exit",						true )
+	MenuRow( "Exit (discards changes since last save)",true )
 );
 
 Menu g_AreaMenu
@@ -1113,10 +1107,9 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
 	{
-	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( "ScreenEditMenu" );
-		break;
 	case SM_GoToNextScreen:
+		// Reload song from disk to discard changes.
+		GAMESTATE->m_pCurSong->LoadFromSongDir( GAMESTATE->m_pCurSong->GetSongDir() );
 		SCREENMAN->SetNewScreen( "ScreenEditMenu" );
 		break;
 	case SM_BackFromMainMenu: