summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_strip.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-11-01 20:57:41 +0000
committerCarl Hetherington <carl@carlh.net>2011-11-01 20:57:41 +0000
commit43f851273295383821d52a697df4f599da87a905 (patch)
tree1c89f0b7761291fb150508d816b5ba3cb1d92fc0 /gtk2_ardour/mixer_strip.cc
parentafcb4309e9c7edc0fbac9c45d2772d5967e58e23 (diff)
Fix thinko in recent commit causing mixer strip buttons to not update on connection changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@10381 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r--gtk2_ardour/mixer_strip.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 255fbfb4a2..caf5a7ccfa 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1219,16 +1219,12 @@ MixerStrip::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost::wea
boost::shared_ptr<Port> a = wa.lock ();
boost::shared_ptr<Port> b = wb.lock ();
- if (!a || !b) {
- return;
- }
-
- if (_route->input()->has_port (a) || _route->input()->has_port (b)) {
+ if ((a && _route->input()->has_port (a)) || (b && _route->input()->has_port (b))) {
update_input_display ();
set_width_enum (_width, this);
}
- if (_route->output()->has_port (a) || _route->output()->has_port (b)) {
+ if ((a && _route->output()->has_port (a)) || (b && _route->output()->has_port (b))) {
update_output_display ();
set_width_enum (_width, this);
}