summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_selection.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-10-21 17:27:03 +0200
committerRobin Gareus <robin@gareus.org>2017-10-21 21:07:18 +0200
commit231e25544bd67eda735e58567562522758b578d1 (patch)
tree0c18604c6dbde11048511a39f0ae0e823d54f46e /gtk2_ardour/editor_selection.cc
parent63b6ab1101bf3e3f67226fa82c8fb11ea2f832e0 (diff)
Tweak 842d758e: selection & move into view
Use separate editor + mixer flags for moving selected tracks into view. Changing selection in the Editor will only pan the mixer-view and vice- versa. This fixes an issue with the track that is being clicked-on to be moved out of view (due to groups)
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
-rw-r--r--gtk2_ardour/editor_selection.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index a263a4e1f7..79cda34f15 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -191,7 +191,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
return;
}
- PBD::Unwinder<bool> uw (_track_selection_change_without_scroll, true);
+ PBD::Unwinder<bool> uw (_editor_track_selection_change_without_scroll, true);
RouteGroup* group = NULL;
if (clicked_routeview) {
@@ -1039,7 +1039,7 @@ Editor::presentation_info_changed (PropertyChange const & what_changed)
break;
default:
set_selected_mixer_strip (*(selection->tracks.back()));
- if (!_track_selection_change_without_scroll) {
+ if (!_track_selection_change_without_scroll && !_editor_track_selection_change_without_scroll) {
ensure_time_axis_view_is_visible (*(selection->tracks.back()), false);
}
break;