fix PresentationInfo::flag_match() to match type bits

[ardour.git] / libs / ardour / ardour / presentation_info.h

diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h
index 91238e6537d0fb840453ff6b7f2c9ade33a68886..612187e3766d4c4072d50efe503d4b92a56c9b67 100644 (file)
--- a/libs/ardour/ardour/presentation_info.h
+++ b/libs/ardour/ardour/presentation_info.h
@@ -125,7 +125,9 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
                OrderSet = 0x400,
 
                /* special mask to delect out "state" bits */
-               StatusMask = (Selected|Hidden)
+               StatusMask = (Selected|Hidden),
+               /* special mask to delect select type bits */
+               TypeMask = (AudioBus|AudioTrack|MidiTrack|MidiBus|VCA|MasterOut|MonitorOut|Auditioner)
        };
 
        static const Flag AllStripables; /* mask to use for any route or VCA (but not auditioner) */
@@ -205,10 +207,13 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
                        return true;
                }
 
-               /* compare without status mask - we already checked that above 
+               /* check for any matching type bits.
+                *
+                * Do comparisoon without status mask or order set bits - we
+                * already checked that above.
                 */
 
-               return (f &~ (StatusMask|OrderSet)) == (_flags &~ (StatusMask|OrderSet));
+               return ((f & TypeMask) & _flags);
        }
 
        int set_state (XMLNode const&, int);