From 264ad268babb7872da7174e33cc9f452a932301d Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Thu, 19 Feb 2009 13:57:22 +0000
Subject: [PATCH] more record-accompany fixes (stable backport)

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@2052 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 src/gui/piano_roll.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp
index de145c23a..ef2133693 100644
--- a/src/gui/piano_roll.cpp
+++ b/src/gui/piano_roll.cpp
@@ -3092,10 +3092,18 @@ void pianoRoll::startRecordNote( const note & _n )
 				engine::getSong()->playMode() ==
 					song::Mode_PlayPattern ) )
 	{
+		midiTime sub;
+		if( engine::getSong()->playMode() == song::Mode_PlaySong )
+		{
+			sub = m_pattern->startPosition();
+		}
 		note n( 1, engine::getSong()->getPlayPos(
-					engine::getSong()->playMode() ),
+					engine::getSong()->playMode() ) - sub,
 				_n.key(), _n.getVolume(), _n.getPanning() );
-		m_recordingNotes << n;
+		if( n.pos() >= 0 )
+		{
+			m_recordingNotes << n;
+		}
 	}
 }