From 0bab9d28228cb2ef82698728380bc5581e5044dc Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 11 Feb 2014 05:52:07 +0100 Subject: [PATCH 1/2] fix crash at exit with '-b', '--bindings' option --- gtk2_ardour/ardour_ui.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bf90ff3c54..88bcb9e486 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -500,6 +500,8 @@ ARDOUR_UI::post_engine () cout << "Action: " << (*n) << " bound to " << (*k) << endl; } + halt_connection.disconnect (); + AudioEngine::instance()->stop (); exit (0); } From b75fb503fb53d46eebe85dbb3fb5b9f163d860a7 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 11 Feb 2014 05:52:39 +0100 Subject: [PATCH 2/2] list action-names as part of --bindings --- gtk2_ardour/ardour_ui.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 88bcb9e486..42f85573ff 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -496,8 +496,9 @@ ARDOUR_UI::post_engine () vector::iterator n; vector::iterator k; - for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) { - cout << "Action: " << (*n) << " bound to " << (*k) << endl; + vector::iterator p; + for (n = names.begin(), k = keys.begin(), p = paths.begin(); n != names.end(); ++n, ++k, ++p) { + cout << "Action: '" << (*n) << "' bound to '" << (*k) << "' Path: '" << (*p) << "'" << endl; } halt_connection.disconnect ();