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/monitor_section.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/monitor_section.cc')
| -rw-r--r-- | gtk2_ardour/monitor_section.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(_route->name())); + tooltip << string_compose (_("<b>OUTPUT</b> 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) { |