summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-11-15 14:13:33 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-11-15 14:13:33 +0000
commit782c9383fc95533a358510292ad06267c66c5af4 (patch)
tree54972b159fefe63a05c1e1a1c5c9b7ce44bcedb1
parente827bb2bff271f99abd3531ddd0e5a01c8ac5014 (diff)
revert previous changes to region selection and action sensitivity handling
git-svn-id: svn://localhost/ardour2/branches/3.0@10613 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/editor_selection.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index b98a7afd73..c598116bad 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -1085,12 +1085,10 @@ Editor::sensitize_the_right_region_actions ()
}
if (_edit_point == EditAtMouse) {
-#if 0
_region_actions->get_action("set-region-sync-position")->set_sensitive (false);
_region_actions->get_action("trim-front")->set_sensitive (false);
_region_actions->get_action("trim-back")->set_sensitive (false);
_region_actions->get_action("split-region")->set_sensitive (false);
-#endif
_region_actions->get_action("place-transient")->set_sensitive (false);
}
@@ -1187,7 +1185,12 @@ Editor::region_selection_changed ()
_regions->block_change_connection (false);
editor_regions_selection_changed_connection.block(false);
- sensitize_the_right_region_actions ();
+ if (!_all_region_actions_sensitized) {
+ /* This selection change might have changed what region actions
+ are allowed, so sensitize them all in case a key is pressed.
+ */
+ sensitize_all_region_actions (true);
+ }
}
void