From de218360d023734675c3533a473dab188c3491fd Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 14 Jul 2014 16:05:31 -0500 Subject: [PATCH] remove some gtk warnings caused by adding monitor buttons without removing them first --- gtk2_ardour/mixer_strip.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1d8988cbef..3fc5347827 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -409,12 +409,20 @@ MixerStrip::~MixerStrip () void MixerStrip::set_route (boost::shared_ptr rt) { + //the rec/monitor stuff only shows up for tracks. + //the show_sends only shows up for buses. + //remove them all here, and we may add them back later + if (show_sends_button->get_parent()) { + rec_mon_table.remove (*show_sends_button); + } if (rec_enable_button->get_parent()) { rec_mon_table.remove (*rec_enable_button); } - - if (show_sends_button->get_parent()) { - rec_mon_table.remove (*show_sends_button); + if (monitor_input_button->get_parent()) { + rec_mon_table.remove (*monitor_input_button); + } + if (monitor_disk_button->get_parent()) { + rec_mon_table.remove (*monitor_disk_button); } RouteUI::set_route (rt);