From 242e8b65fd11334482723727b94fb6cc87e3214a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 29 Dec 2005 03:29:20 +0000
Subject: [PATCH] merge undo handling

---
 stepmania/src/ScreenEdit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 3b0506ef35..16f15baa0a 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -1331,8 +1331,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
 	case EDIT_BUTTON_OPEN_PREV_STEPS:
 		{
 			// don't keep undo when changing Steps
-			m_bHasUndo = false;
-			m_Undo.ClearAll();
+			ClearUndo();
 
 			// save current steps
 			Steps* pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
@@ -3265,6 +3264,7 @@ void ScreenEdit::Undo()
 void ScreenEdit::ClearUndo()
 {
 	m_bHasUndo = false;
+	m_Undo.ClearAll();
 }
 
 static LocalizedString CREATES_MORE_THAN_NOTES	( "ScreenEdit", "This change creates more than %d notes in a measure." );