From fa479f08dd6c790477bd0faeb43df888fa17b2e7 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 8 Mar 2005 09:03:12 +0000
Subject: [PATCH] split ScreenMemcardSaveEditsInEditor into
 ScreenMemcardSaveEditsAfterSave and ScreenMemcardSaveEditsAfterExit

---
 stepmania/Themes/default/metrics.ini |  4 +++-
 stepmania/src/ScreenEdit.cpp         | 16 ++++++++++++----
 stepmania/src/ScreenEdit.h           |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 868cb6f997..f435ecf607 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -4242,4 +4242,6 @@ StepsTypesToHide=
 
 [ScreenMemcardSaveEditsAfterDeleteSteps]
 
-[ScreenMemcardSaveEditsInEditor]
+[ScreenMemcardSaveEditsAfterSave]
+
+[ScreenMemcardSaveEditsAfterExit]
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index edcf4f7f57..9942f63d65 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1741,9 +1741,9 @@ void ChangeArtistTranslit( CString sNew )
 }
 
 ScreenEdit *g_pScreenEdit = NULL;
-static void DoSave( void* )
+static void DoSaveOnExit( void* )
 {
-	g_pScreenEdit->HandleMainMenuChoice( ScreenEdit::save, NULL );
+	g_pScreenEdit->HandleMainMenuChoice( ScreenEdit::save_on_exit, NULL );
 }
 
 // End helper functions
@@ -1789,6 +1789,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers )
 			}
 			break;
 		case save:
+		case save_on_exit:
 			{
 				// copy edit into current Steps
 				Steps* pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
@@ -1799,7 +1800,14 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers )
 
 				if( HOME_EDIT_MODE )
 				{
-					SCREENMAN->AddNewScreenToTop( "ScreenMemcardSaveEditsInEditor", SM_None );
+					CString s;
+					switch( c )
+					{
+					case save:			s = "ScreenMemcardSaveEditsAfterSave";	break;
+					case save_on_exit:	s = "ScreenMemcardSaveEditsAfterExit";	break;
+					default:		ASSERT(0);
+					}
+					SCREENMAN->AddNewScreenToTop( s, SM_None );
 				}
 				else
 				{
@@ -1950,7 +1958,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, int* iAnswers )
 			SCREENMAN->Prompt(
 				SM_DoExit,
 				"Do you want to save changes before exiting?",
-				PROMPT_YES_NO_CANCEL, ANSWER_NO, DoSave );
+				PROMPT_YES_NO_CANCEL, ANSWER_NO, DoSaveOnExit );
 			break;
 		default:
 			ASSERT(0);
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index e00f8e43d3..fa62611bcd 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -211,6 +211,7 @@ public:
 		play_preview_music,
 		preferences,
 		exit,
+		save_on_exit,
 		NUM_MAIN_MENU_CHOICES
 	};
 	void HandleMainMenuChoice( MainMenuChoice c, int* iAnswers );