diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
| commit | 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch) | |
| tree | 1236e40183b677abf4a2882e4cfe8e0a345eb24d /gtk2_ardour/marker.cc | |
| parent | 19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff) | |
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 771683d80e..dd5a70bb7d 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -245,7 +245,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con mark->property_outline_color_rgba() = rgba; mark->property_width_pixels() = 1; Pango::FontDescription* font = get_font_for_style (N_("MarkerText")); - + text = new Text (*group); text->property_text() = annotation.c_str(); text->property_font_desc() = *font; @@ -285,6 +285,7 @@ Marker::~Marker () if (line) { delete line; + line = 0; } } |