diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-04-29 03:27:08 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:15 +1000 |
| commit | 37ed0f6e9b39f1661688dafea14b22efebe39cab (patch) | |
| tree | 00f1829324d3869287b34ee044a29defa88c9ee0 /gtk2_ardour/editor_markers.cc | |
| parent | bfeb105256f3c98eefeb9571fea0afca603ef0c5 (diff) | |
Tempo ramps - restore correct drag behaviour wrt audio-locked meters and right-click of associalted tempo
Diffstat (limited to 'gtk2_ardour/editor_markers.cc')
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 9664d6f65f..e8b37606d6 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -815,7 +815,7 @@ Editor::tempo_or_meter_marker_context_menu (GdkEventButton* ev, ArdourCanvas::It if (!tm->tempo().active()) { return; } - can_remove = tm->tempo().movable (); + can_remove = tm->tempo().movable() && !tm->tempo().locked_to_meter(); delete tempo_marker_menu; build_tempo_marker_menu (tm, can_remove); tempo_marker_menu->popup (1, ev->time); @@ -997,7 +997,6 @@ Editor::build_tempo_marker_menu (TempoMarker* loc, bool can_remove) items.push_back (MenuElem (_("Edit..."), sigc::mem_fun(*this, &Editor::marker_menu_edit))); items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); - items.back().set_sensitive (can_remove); } |