From 10ed615772b873744e3cb3c79dcda3157402dc26 Mon Sep 17 00:00:00 2001 From: GZharun Date: Mon, 26 Jan 2015 17:50:13 +0200 Subject: [PATCH] [Summary] Fixed bug 46017: Eliminated possibility to remove loop range [Reviewed by QA] MKosharniy --- gtk2_ardour/editor_markers.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 6045d1250d..d5d8617e51 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -471,6 +471,11 @@ Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*) Location* loc = find_location_from_marker (marker, is_start); + // loop range cannot be removed in TracksLive + if (loc->is_auto_loop() ) { + return; + } + if (_session && loc) { Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc)); } @@ -554,8 +559,8 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item) bool is_start; Location * loc = find_location_from_marker (marker, is_start); - - if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) { + + if (loc == transport_punch_location() || loc->is_session_range ()) { if (transport_marker_menu == 0) { build_range_marker_menu (loc == transport_loop_location() || loc == transport_punch_location(), loc->is_session_range());