div wrapping

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 68c9a0909e103a538efa4e64cb89d65505b2e97c..06c984adcbb9ef63c53a20f66f446e97deca6018 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -779,9 +779,9 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
        if (is_midi_track()) {
 
-               /* rec-enable button exits from step editing */
+               /* rec-enable button exits from step editing, but not context click */
 
-               if (midi_track()->step_editing()) {
+               if (!Keyboard::is_context_menu_event (ev) && midi_track()->step_editing()) {
                        midi_track()->set_step_editing (false);
                        return false;
                }
@@ -992,6 +992,7 @@ RouteUI::toggle_rec_safe ()
 void
 RouteUI::step_edit_changed (bool yn)
 {
+       cerr << _route->name() << " step editing changed to " << yn << endl;
        if (yn) {
                if (rec_enable_button) {
                        rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);

diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index 1b017bbd53bedd8ecec2c0b7b87e10d6a2a379e7..175d58a0c0a9832d3f1ba8c9b9629cdcfadb52b7 100644 (file)
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include "pbd/stacktrace.h"
+
 #include "ardour/midi_track.h"
 #include "ardour/midi_region.h"
 #include "ardour/tempo.h"
@@ -155,8 +157,11 @@ StepEditor::step_entry_hidden (GdkEventAny*)
 void
 StepEditor::step_entry_done ()
 {
+       cerr << this << " SE done\n";
+
        hide_connection.disconnect ();
        delete_connection.disconnect ();
+
        /* everything else will follow the change in the model */
        _track->set_step_editing (false);
 }

diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 1608f13c7e75c80d580a29c366bf9483637b35be..ca2bb91c4250402cac3efbbb799586365f27c0c5 100644 (file)
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -660,6 +660,8 @@ MidiTrack::set_step_editing (bool yn)
        }
 
        if (yn != _step_editing) {
+               std::cerr << "\n\n\n" << name() << " changed step editing to " << yn << std::endl;
+               PBD::stacktrace (std::cerr, 100);
                _step_editing = yn;
                StepEditStatusChange (yn);
        }