side-chain button select connects exclusively

[ardour.git] / gtk2_ardour / monitor_section.cc

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 9702d7f25b85c6056fb401d2321d994c4a34889d..f24cab7c3e68a7c67444a6a5b1ff51c903dd23f8 100644 (file)
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -39,6 +39,7 @@
 #include "ardour/user_bundle.h"
 #include "ardour/plugin_manager.h"
 
+#include "ardour_ui.h"
 #include "gui_thread.h"
 #include "monitor_section.h"
 #include "public_editor.h"
@@ -94,7 +95,9 @@ MonitorSection::MonitorSection (Session* s)
        if (!monitor_actions) {
                register_actions ();
                load_bindings ();
-               set_data ("ardour-bindings", bindings);
+               if (bindings) {
+                       set_data ("ardour-bindings", bindings);
+               }
        }
 
        _plugin_selector = new PluginSelector (PluginManager::instance());
@@ -495,19 +498,18 @@ MonitorSection::~MonitorSection ()
        _channel_buttons.clear ();
        _output_changed_connection.disconnect ();
 
-       delete insert_box;
-       delete output_button;
-       delete gain_control;
-       delete gain_display;
-       delete dim_control;
-       delete dim_display;
-       delete solo_boost_control;
-       delete solo_boost_display;
-       delete solo_cut_control;
-       delete solo_cut_display;
-       delete _tearoff;
-       delete _output_selector;
-       _output_selector = 0;
+       delete insert_box; insert_box = 0;
+       delete output_button; output_button = 0;
+       delete gain_control; gain_control = 0;
+       delete gain_display; gain_display = 0;
+       delete dim_control; dim_control = 0;
+       delete dim_display; dim_display = 0;
+       delete solo_boost_control; solo_boost_control = 0;
+       delete solo_boost_display; solo_boost_display = 0;
+       delete solo_cut_control; solo_cut_control = 0;
+       delete solo_cut_display; solo_cut_display = 0;
+       delete _tearoff; _tearoff = 0;
+       delete _output_selector; _output_selector = 0;
 }
 
 bool
@@ -1667,7 +1669,7 @@ MonitorSection::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost:
 void
 MonitorSection::load_bindings ()
 {
-       bindings = Bindings::get_bindings (X_("monitor section"), myactions);
+       bindings = Bindings::get_bindings (X_("Monitor Section"), myactions);
 }
 
 void