summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_selection.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-08-10 10:38:48 +0000
committerCarl Hetherington <carl@carlh.net>2010-08-10 10:38:48 +0000
commit67c0dd5310864d33149571cd433d689aa29d0557 (patch)
tree6545399a0ec7154cbe8dfe8011fd85ae32e513b5 /gtk2_ardour/editor_selection.cc
parent48063c15df30d7616739fd001f09e33720ccfa29 (diff)
Fix last-minute breakage of Ctrl-Click.
git-svn-id: svn://localhost/ardour2/branches/3.0@7585 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_selection.cc')
-rw-r--r--gtk2_ardour/editor_selection.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 53ce04351d..a72d595b2f 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -976,7 +976,8 @@ Editor::invert_selection ()
* @param end End time in session frames.
* @param top Top (lower) y limit in trackview coordinates (ie 0 at the top of the track view)
* @param bottom Bottom (higher) y limit in trackview coordinates (ie 0 at the top of the track view)
- * @param preserve_if_selected true to leave the current selection alone if all of the selectables within the region are already selected.
+ * @param preserve_if_selected true to leave the current selection alone if we're adding to the selection and all of the selectables
+ * within the region are already selected.
*/
bool
Editor::select_all_within (
@@ -998,7 +999,7 @@ Editor::select_all_within (
return false;
}
- if (preserve_if_selected) {
+ if (preserve_if_selected && op != Selection::Toggle) {
list<Selectable*>::iterator i = found.begin();
while (i != found.end() && (*i)->get_selected()) {
++i;