From 57947b2252e426aae05b8af5b8fcbdfc1c0ba251 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 30 Jan 2006 07:09:25 +0000
Subject: [PATCH] Use ScreenManager's preload logic, instead of manually
 loading a bunch of screens.

---
 stepmania/Themes/default/Scripts/Other.lua | 3 ++-
 stepmania/src/ScreenEdit.cpp               | 6 +-----
 stepmania/src/ScreenEdit.h                 | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua
index 1f4be7b766..a4e605524d 100644
--- a/stepmania/Themes/default/Scripts/Other.lua
+++ b/stepmania/Themes/default/Scripts/Other.lua
@@ -47,7 +47,8 @@ function GetEditModeSubScreens()
 		"ScreenMiniMenuBackgroundChange," ..
 		"ScreenMiniMenuInsertTapAttack," ..
 		"ScreenMiniMenuInsertCourseAttack," ..
-		"ScreenMiniMenuCourseDisplay";
+		"ScreenMiniMenuCourseDisplay," ..
+		"ScreenEditOptions";
 end
 
 function GetCoursesToShowRanking()
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 0cb591010f..a57e075b9b 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -726,8 +726,6 @@ void ScreenEdit::Init()
 	m_soundSwitch.Load(	THEME->GetPathS("ScreenEdit","switch") );
 	m_soundSave.Load(	THEME->GetPathS("ScreenEdit","save") );
 
-	m_pScreenOptions = SCREENMAN->MakeNewScreen( "ScreenEditOptions" );
-
 	m_soundMusic.Load( m_pSong->GetMusicPath() );
 
 	m_soundAssistTick.Load( THEME->GetPathS("ScreenEdit","assist tick"), true );
@@ -743,8 +741,6 @@ ScreenEdit::~ScreenEdit()
 
 	LOG->Trace( "ScreenEdit::~ScreenEdit()" );
 	m_soundMusic.StopPlaying();
-
-	SAFE_DELETE( m_pScreenOptions );
 }
 
 // play assist ticks
@@ -2628,7 +2624,7 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 			ScreenPrompt::Prompt( SM_DoRevertFromDisk, REVERT_FROM_DISK.GetValue() + "\n\n" + DESTROY_ALL_UNSAVED_CHANGES.GetValue(), PROMPT_YES_NO, ANSWER_NO );
 			break;
 		case options:
-			SCREENMAN->PushScreen( m_pScreenOptions, false, SM_BackFromOptions );
+			SCREENMAN->AddNewScreenToTop( "ScreenEditOptions", SM_BackFromOptions );
 			break;
 		case edit_song_info:
 			{
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 4407374e38..b8affb8433 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -434,8 +434,6 @@ public:
 	void MakeFilteredMenuDef( const MenuDef* pDef, MenuDef &menu );
 	ScreenMiniMenu *LoadEditMiniMenu( const MenuDef* pDef );
 	void EditMiniMenu( const MenuDef* pDef, ScreenMessage SM_SendOnOK = SM_None, ScreenMessage SM_SendOnCancel = SM_None );
-
-	Screen *m_pScreenOptions;
 };
 
 #endif