Fix thinko in recent commit causing mixer strip buttons to not update on connection...
authorCarl Hetherington <carl@carlh.net>
Tue, 1 Nov 2011 20:57:41 +0000 (20:57 +0000)
committerCarl Hetherington <carl@carlh.net>
Tue, 1 Nov 2011 20:57:41 +0000 (20:57 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@10381 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/mixer_strip.cc

index 255fbfb4a259650e4bcdeb89b27e725cdd6cfe01..caf5a7ccfa4cfa9878a2dee1ddacbc215c839b26 100644 (file)
@@ -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);
        }