From a4841c349b8b47746c10afde1a16ea37b506ecc1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 15 Jul 2005 01:18:42 +0000
Subject: [PATCH] ScreenWithMenuElements::BeginScreen: start tweening, and also
 reset any previous transitions.

---
 stepmania/src/ScreenWithMenuElements.cpp | 9 +++++++++
 stepmania/src/ScreenWithMenuElements.h   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index 815184edb7..98112c2c37 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -139,9 +139,18 @@ void ScreenWithMenuElements::Init()
 	this->AddChild( &m_Cancel );
 
 	this->SortByDrawOrder();
+}
+
+void ScreenWithMenuElements::BeginScreen()
+{
+	m_In.Reset();
+	m_Out.Reset();
+	m_Cancel.Reset();
 
 	TweenOnScreen();
 	m_In.StartTransitioning( SM_DoneFadingIn );
+
+	Screen::BeginScreen();
 }
 
 void ScreenWithMenuElements::TweenOnScreen()
diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h
index 7deaba78ca..bfd9985574 100644
--- a/stepmania/src/ScreenWithMenuElements.h
+++ b/stepmania/src/ScreenWithMenuElements.h
@@ -17,6 +17,7 @@ class ScreenWithMenuElements : public Screen
 public:
 	ScreenWithMenuElements( CString sName );
 	virtual void Init();
+	virtual void BeginScreen();
 	virtual ~ScreenWithMenuElements();
 
 	void Update( float fDeltaTime );