summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_selection.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-08-30 18:59:02 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-08-30 18:59:02 +0000
commit5da31b63a9d047acb80a61ac6ac7eed67edba799 (patch)
tree6aa63331d57f04ad847e4c95892945b43c13a429 /gtk2_ardour/editor_selection.cc
parenta1a86992eae230ab92926feb7134889e1d77c38b (diff)
don't display range selection when track selection changes and we're not in the right mouse mode
git-svn-id: svn://localhost/ardour2/branches/3.0@7717 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
-rw-r--r--gtk2_ardour/editor_selection.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 1ee275955e..893adf0262 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -893,7 +893,9 @@ Editor::track_selection_changed ()
(*j)->set_selected (find (selection->tracks.begin(), selection->tracks.end(), j->get()) != selection->tracks.end());
}
- if (yn) {
+ if (yn &&
+ ((mouse_mode == MouseRange) ||
+ ((mouse_mode == MouseObject) && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT)))) {
(*i)->reshow_selection (selection->time);
} else {
(*i)->hide_selection ();