From a08905af5bd2d50127654da0c2f93dfcb6a1d287 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 8 Dec 2008 04:52:44 +0000 Subject: [PATCH] fixed glitch where song editor would use auto-scroll even if it was disabled (stable backport) git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@1883 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 6 ++++++ src/gui/song_editor.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 545cffee7..a9b0aa328 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-07 Andrew Kelley + + * src/gui/song_editor.cpp: + fixed glitch where it would auto-scroll even if it was off in + song-editor + 2008-12-04 Tobias Doerffel * plugins/vst_base/remote_vst_plugin.cpp: diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 881c2efbc..399a5a468 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -645,7 +645,8 @@ void songEditor::masterPitchReleased( void ) void songEditor::updatePosition( const midiTime & _t ) { - if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong ) || + if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong + && m_timeLine->autoScroll() == timeLine::AutoScrollEnabled) || m_scrollBack == TRUE ) { const int w = width() - DEFAULT_SETTINGS_WIDGET_WIDTH