diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-16 15:33:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-16 15:33:04 +0000 |
| commit | 6ef5d85ae1f2c500c4163cd1df580b3f26991c1e (patch) | |
| tree | 15194a52bb72f036117fc4c87c193a4cbb64be8b /gtk2_ardour/editor_canvas.cc | |
| parent | 830911f6f9451d83a58043b3f9084d3caa164b7b (diff) | |
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 510b7e019f..4ea6d27ea2 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -801,7 +801,7 @@ Editor::scroll_canvas_horizontally () } #ifndef GTKOSX - if (!autoscroll_active) { + if (!autoscroll_active && !_stationary_playhead) { /* force rulers and canvas to move in lock step */ while (gtk_events_pending ()) { gtk_main_iteration (); |