merge with master, primarily for adrian's maximise-mixer change

[ardour.git] / gtk2_ardour / region_view.cc

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 530d046f5ae8d823cb1471b62a01dc099ec71380..f468eedb60b643bec604dd2856abc1a69204cb81 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -69,8 +69,9 @@ RegionView::RegionView (ArdourCanvas::Group*              parent,
                         Gdk::Color const &                basic_color,
                        bool                              automation)
        : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, automation,
-                           TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
-                                                         TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame))
+                           (automation ? TimeAxisViewItem::ShowFrame :
+                            TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText|
+                                                          TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame)))
        , _region (r)
        , sync_mark(0)
        , sync_line(0)