diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-22 19:19:24 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch) | |
| tree | 2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /gtk2_ardour/editor_canvas.cc | |
| parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) | |
cleanup various merge conflict resolution errors/omissions
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 b3668ba194..cd5023916e 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -506,7 +506,7 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers) return; } - if (!UIConfiguration::instance()->get_autoscroll_editor () || autoscroll_active ()) { + if (!UIConfiguration::instance().get_autoscroll_editor () || autoscroll_active ()) { return; } |