Merge branch 'stable-1.1'

2014-11-30 15:08:14 +02:00
parent d907aa1cba 4cbb2b721f
commit 2a78769078
4 changed files with 68 additions and 2 deletions
--- a/src/core/Timeline.cpp
+++ b/src/core/Timeline.cpp
@@ -294,6 +294,7 @@ void Timeline::mousePressEvent( QMouseEvent* event )
 	}
 	else if( event->button() == Qt::RightButton || event->button() == Qt::MiddleButton )
 	{
+        	m_moveXOff = s_posMarkerPixmap->width() / 2;
 		const MidiTime t = m_begin + static_cast<int>( event->x() * MidiTime::ticksPerTact() / m_ppt );
 		if( m_loopPos[0] > m_loopPos[1]  )
 		{