From e29dc599a83bd2d7c3fea8f7ea0376a47786e2ec Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 4 Sep 2014 10:49:38 -0400 Subject: [PATCH] fix merge conflict resolution error - use controls layout button press event handler (fixes dbl-click to add track) --- gtk2_ardour/editor.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 1853d90075..0c9c0f4955 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -525,6 +525,7 @@ Editor::Editor () _group_tabs = new EditorGroupTabs (this); controls_layout.set_name ("EditControlsBase"); controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::SCROLL_MASK); + controls_layout.signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_press)); controls_layout.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_release)); controls_layout.signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::control_layout_scroll), false); @@ -3582,7 +3583,7 @@ bool Editor::edit_controls_button_press (GdkEventButton* ev) { if ( (ev->button == 1) && (ev->type == GDK_2BUTTON_PRESS) ) { - ARDOUR_UI::instance()->add_audio_track_instantly (); + ARDOUR_UI::instance()->add_audio_track_instantly (); } return true;