ctrl-click when adding automation points no longer adds guard points

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 9a96b4b0bedebd121e0d995adb42f783583260cd..11f845f8a7fd03b4c15a0987e4fcf72c33f2b12a 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -122,10 +122,9 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
                y = std::max (y, 0.0);
                y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
 
-               /* no guard points if primary modifier is used */
-
-               bool with_guard_points = !Gtkmm2ext::Keyboard::modifier_state_equals (ev->button.state, Gtkmm2ext::Keyboard::PrimaryModifier);
+               /* no guard points only if primary modifier is used */
 
+               bool with_guard_points = Gtkmm2ext::Keyboard::modifier_state_equals (ev->button.state, Gtkmm2ext::Keyboard::PrimaryModifier);
                add_automation_event (ev, trackview.editor().pixel_to_sample (x) - _region->position() + _region->start(), y, with_guard_points);
        }
 

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index ca3fdd1369b4d50e45f7d91a63e2f86b49126ee3..1eef1bc1214d8cf3d2eeef9a3f25f8109438774f 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1682,7 +1682,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        case AutomationTrackItem:
                                atv = dynamic_cast<AutomationTimeAxisView*>(clicked_axisview);
                                if (atv) {
-                                       bool with_guard_points = !Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
+                                       bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
                                        atv->add_automation_event (event, where, event->button.y, with_guard_points);
                                }
                                return true;
@@ -1702,7 +1702,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                                */
                                AudioRegionView* arv = dynamic_cast<AudioRegionView*> (clicked_regionview);
                                if (!were_dragging && arv) {
-                                       bool with_guard_points = !Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
+                                       bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
                                        arv->add_gain_point_event (item, event, with_guard_points);
                                }
                                return true;
@@ -1710,7 +1710,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        }
 
                        case AutomationTrackItem: {
-                               bool with_guard_points = !Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
+                               bool with_guard_points = Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier);
                                dynamic_cast<AutomationTimeAxisView*>(clicked_axisview)->
                                        add_automation_event (event, where, event->button.y, with_guard_points);
                                return true;