diff options
author | Hans Fugal <hans@fugal.net> | 2006-08-12 21:57:07 +0000 |
---|---|---|
committer | Hans Fugal <hans@fugal.net> | 2006-08-12 21:57:07 +0000 |
commit | 1f20fbbad8cf9deda3743003bbc40b14ba06465d (patch) | |
tree | 623cc58dff647a6da432c6966ea6a4c63f01db6f /gtk2_ardour/region_view.cc | |
parent | 8e1c9186cbe02481f3cf7986ccd4bbe0fea6af65 (diff) |
merge from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@802 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.cc')
-rw-r--r-- | gtk2_ardour/region_view.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index ebec4261ac..8e80b147e5 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -111,10 +111,14 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) compute_colors (basic_color); name_highlight->set_data ("regionview", this); - name_text->set_data ("regionview", this); + + if (name_text) { + name_text->set_data ("regionview", this); + } /* an equilateral triangle */ - ArdourCanvas::Points shape; + + ArdourCanvas::Points shape; shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1)); shape.push_back (Gnome::Art::Point ((sync_mark_width - 1)/2, 1)); shape.push_back (Gnome::Art::Point (0, sync_mark_width - 1)); |