revert previous changes to region selection and action sensitivity handling
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 15 Nov 2011 14:13:33 +0000 (14:13 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 15 Nov 2011 14:13:33 +0000 (14:13 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@10613 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/editor_selection.cc

index b98a7afd731e5b2559ce79e70cda2379f9a0c127..c598116bade542f3d6acf01f20d831cd7d62062e 100644 (file)
@@ -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