From 4d0070cadb272a955677405f803a540c44ccb91e Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 16 Jan 2011 13:52:25 -0500
Subject: [PATCH] Reverse the order. Get some implementation.

Upon editing, the new TimeSignature doesn't show.
Still more to do.
---
 src/ScreenEdit.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 27e74b0f82..db9cff2e42 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -2580,7 +2580,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 		int iNum = atoi( ScreenTextEntry::s_sLastAnswer );
 		if( iNum > 0 )
 		{
-			
+			m_pSong->m_Timing.SetTimeSignatureAtBeat( GAMESTATE->m_fSongBeat, iNum, 99 );
 		}
 		SetDirty( true );
 	}
@@ -2589,7 +2589,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 		int iDen = atoi( ScreenTextEntry::s_sLastAnswer );
 		if( iDen > 0)
 		{
-			
+			m_pSong->m_Timing.SetTimeSignatureDenominatorAtBeat( GAMESTATE->m_fSongBeat, iDen );
 		}
 		SetDirty( true );
 	}
@@ -3118,18 +3118,19 @@ void ScreenEdit::HandleMainMenuChoice( MainMenuChoice c, const vector<int> &iAns
 				);
 			break;
 		case edit_time_signature:
-			ScreenTextEntry::TextEntry(
-				SM_BackFromTimeSignatureNumeratorChange,
-				ENTER_TIME_SIGNATURE_NUMERATOR_VALUE,
-				ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iNumerator ),
-				3
-			);
+			// These need to be in reverse order due to the stack nature.
 			ScreenTextEntry::TextEntry(
 				SM_BackFromTimeSignatureDenominatorChange,
 				ENTER_TIME_SIGNATURE_DENOMINATOR_VALUE,
 				ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iDenominator ),
 				3
 			);
+			ScreenTextEntry::TextEntry(
+				SM_BackFromTimeSignatureNumeratorChange,
+				ENTER_TIME_SIGNATURE_NUMERATOR_VALUE,
+				ssprintf( "%d", m_pSong->m_Timing.GetTimeSignatureSegmentAtBeat( GAMESTATE->m_fSongBeat ).m_iNumerator ),
+				3
+			);
 			break;
 		case play_preview_music:
 			PlayPreviewMusic();