diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-03 21:02:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-03 21:02:29 +0000 |
| commit | 9decb3e027b402438471f357d5a17f4c5190a039 (patch) | |
| tree | aef074cdfe656708cebd622941a55c5f9ad91f70 /gtk2_ardour/marker.cc | |
| parent | 133a66920bbdd3bc11bd4ae866048b0f1f52ecd4 (diff) | |
remove static Pango::FontDescriptions, they cause glib errors because of initialization before Glib::thread_init() has been called
git-svn-id: svn://localhost/ardour2/trunk@2100 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index a177821b96..a0f91d2a2a 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -243,11 +243,14 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con mark->property_fill_color_rgba() = rgba; mark->property_outline_color_rgba() = rgba; mark->property_width_pixels() = 1; - Pango::FontDescription font = get_font_for_style (N_("MarkerText")); + Pango::FontDescription* font = get_font_for_style (N_("MarkerText")); text = new Text (*group); text->property_text() = annotation.c_str(); - text->property_font_desc() = font; + text->property_font_desc() = *font; + + delete font; + if (annotate_left) { text->property_x() = -(text->property_text_width()); } else { |