From e8b325eac2b9499217df226d481b0d3ae36e652a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 13 Sep 2006 02:31:48 +0000
Subject: [PATCH] fix merge

---
 stepmania/src/Player.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 96558565c2..47a36c10a7 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -1490,6 +1490,7 @@ void Player::CrossedMineRow( int iNoteRow, const RageTimer &now )
 			GameInput GameI = GAMESTATE->m_pCurStyle->StyleInputToGameInput( t, pn );
 			if( PREFSMAN->m_fPadStickSeconds > 0 )
 			{
+				float fSecsHeld = INPUTMAPPER->GetSecsHeld( GameI, m_pPlayerState->m_mp );
 				if( fSecsHeld >= PREFSMAN->m_fPadStickSeconds )
 					Step( t, -1, now+(-PREFSMAN->m_fPadStickSeconds), true, false );
 			}