From 8b80fe04ad0cc4dc5429f65e21ed636ed87dc634 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 14 Oct 2015 22:39:46 +0200 Subject: 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. --- gtk2_ardour/monitor_section.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/monitor_section.cc') diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index aa5a85ac94..6ff9de091e 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1352,7 +1352,7 @@ MonitorSection::update_output_display () char * tooltip_cstr; io_count = _route->n_outputs().n_total(); - tooltip << string_compose (_("OUTPUT from %1"), Glib::Markup::escape_text(_route->name())); + tooltip << string_compose (_("OUTPUT from %1"), Glib::Markup::escape_text(_route->name().c_str())); for (io_index = 0; io_index < io_count; ++io_index) { @@ -1378,12 +1378,12 @@ MonitorSection::update_output_display () } if (io_connection_count == 0) { - tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) + tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)).c_str() << " -> " - << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ); + << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str(); } else { tooltip << ", " - << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ); + << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str(); } if (connection_name.find("ardour:") == 0) { -- cgit v1.2.3