From 5de0b03af23c506e8a1c309b4e029274fcdd2f9e Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 18 Jun 2006 12:09:28 +0000
Subject: [PATCH] fix editor screen branching

---
 stepmania/Themes/default/metrics.ini           | 1 +
 stepmania/src/ScreenOptionsManageEditSteps.cpp | 8 +++++---
 stepmania/src/ScreenOptionsManageEditSteps.h   | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 4b79955d7a..8639f870db 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -4554,6 +4554,7 @@ Fallback=ScreenGameplay DifficultyMeterP2
 [ScreenOptionsManageEditSteps]
 Class=ScreenOptionsManageEditSteps
 Fallback=ScreenOptionsSimple
+CreateNewScreen=ScreenEditMenu
 EditMode=Full
 PrevScreen=ScreenSelectEditMode
 NextScreen=ScreenOptionsEditCourse
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.cpp b/stepmania/src/ScreenOptionsManageEditSteps.cpp
index 96901a12a5..3feac6f7d2 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.cpp
+++ b/stepmania/src/ScreenOptionsManageEditSteps.cpp
@@ -50,6 +50,8 @@ REGISTER_SCREEN_CLASS( ScreenOptionsManageEditSteps );
 void ScreenOptionsManageEditSteps::Init()
 {
 	ScreenOptions::Init();
+
+	CREATE_NEW_SCREEN.Load( m_sName, "CreateNewScreen" );
 }
 
 void ScreenOptionsManageEditSteps::BeginScreen()
@@ -124,7 +126,8 @@ void ScreenOptionsManageEditSteps::HandleScreenMessage( const ScreenMessage SM )
 
 		if( iCurRow == 0 )	// "create new"
 		{
-			// do base behavior
+			SCREENMAN->SetNewScreen( CREATE_NEW_SCREEN );
+			return;	// don't call base
 		}
 		else if( m_pRows[iCurRow]->GetRowType() == OptionRow::RowType_Exit )
 		{
@@ -137,8 +140,7 @@ void ScreenOptionsManageEditSteps::HandleScreenMessage( const ScreenMessage SM )
 			ASSERT( pSteps );
 			const Style *pStyle = GAMEMAN->GetEditorStyleForStepsType( pSteps->m_StepsType );
 			GAMESTATE->m_pCurStyle.Set( pStyle );
-			SCREENMAN->SetNewScreen( "ScreenEdit" );
-			return;	// don't call base
+			// do base behavior
 		}
 	}
 	else if( SM == SM_BackFromRename )
diff --git a/stepmania/src/ScreenOptionsManageEditSteps.h b/stepmania/src/ScreenOptionsManageEditSteps.h
index 0c22adc97c..cb786e8ba4 100644
--- a/stepmania/src/ScreenOptionsManageEditSteps.h
+++ b/stepmania/src/ScreenOptionsManageEditSteps.h
@@ -24,6 +24,8 @@ protected:
 	Steps *GetStepsWithFocus() const;
 
 	vector<Steps*> m_vpSteps;
+
+	ThemeMetric<RString> CREATE_NEW_SCREEN;
 };
 
 #endif