Implements review comments

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index ebede87dfaa6e6494ffe74721dc2acf56e172875..a7268c99872daaf45aa2973ad998b158827c2e8d 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -432,8 +432,6 @@ Mixer_UI::add_strips (RouteList& routes)
                }
 
        } catch (const std::exception& e) {
-               // this should never happen as it leaks memory and leaves connections established
-               assert(false);
                error << string_compose (_("Error adding GUI elements for new tracks/busses %1"), e.what()) << endmsg;
        }
 

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 297aa04288225dd648ae3c5e1539457ce7a71c39..af2168881376f5290dcb58f7c498e9dc1f65453e 100644 (file)
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -186,7 +186,6 @@ MonitorSection::MonitorSection (Session* s)
        set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors"));
 
        proctoggle = ActionManager::get_action (X_("Monitor"), X_("toggle-monitor-processor-box"));
-       assert(proctoggle);
        toggle_processorbox_button.set_related_action (proctoggle);
 
        /* Knobs */
@@ -911,7 +910,7 @@ MonitorSection::register_actions ()
        myactions.register_radio_action (solo_actions, solo_group, "solo-use-pfl", _("Pre Fade Listen (PFL) solo"),
                        sigc::mem_fun (*this, &MonitorSection::solo_use_pfl));
 
-       proctoggle = myactions.register_toggle_action (monitor_actions, "toggle-monitor-processor-box", _("Toggle Monitor Section Processor Box"),
+       myactions.register_toggle_action (monitor_actions, "toggle-monitor-processor-box", _("Toggle Monitor Section Processor Box"),
                        sigc::mem_fun(*this, &MonitorSection::update_processor_box));
 }