diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-14 22:39:46 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-14 22:46:15 +0200 |
| commit | 8b80fe04ad0cc4dc5429f65e21ed636ed87dc634 (patch) | |
| tree | edbc7965b8701f82852e1fff96f84a6d24f158cc /gtk2_ardour/route_time_axis.cc | |
| parent | 5eefdf7536e2b5fc10b98669c52cdbee13e6215c (diff) | |
Avoid calls to Glib::ustring << operator at all cost.
Glib::operator<<(std::ostream&, Glib::ustring const&) involves
loadlocale which is not thread-safe on OSX.
This fixes various seemingly random crashes on OSX.
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 5a1585289c..92ae7e0a0f 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1790,8 +1790,8 @@ RouteTimeAxisView::update_playlist_tip () set_tooltip ( playlist_button, string_compose(_("Take: %1.%2"), - Glib::Markup::escape_text(rg->name()), - Glib::Markup::escape_text(take_name)) + Glib::Markup::escape_text(rg->name()).c_str(), + Glib::Markup::escape_text(take_name).c_str()) ); return; @@ -1799,7 +1799,7 @@ RouteTimeAxisView::update_playlist_tip () } /* set the playlist button tooltip to the playlist name */ - set_tooltip (playlist_button, _("Playlist") + std::string(": ") + Glib::Markup::escape_text(track()->playlist()->name())); + set_tooltip (playlist_button, _("Playlist") + std::string(": ") + Glib::Markup::escape_text(track()->playlist()->name()).c_str()); } |