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.
This commit is contained in:
Robin Gareus 2015-10-14 22:39:46 +02:00
parent 5eefdf7536
commit 8b80fe04ad
8 changed files with 21 additions and 21 deletions

View file

@ -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());
}