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
This commit is contained in:
Andrew Kelley
2008-12-08 04:52:44 +00:00
parent b289c7a7a5
commit a08905af5b
2 changed files with 8 additions and 1 deletions

View File

@@ -1,3 +1,9 @@
2008-12-07 Andrew Kelley <superjoe30/at/gmail/dot/com>
* 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 <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/vst_base/remote_vst_plugin.cpp:

View File

@@ -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