diff options
| author | Robin Gareus <robin@gareus.org> | 2015-09-19 18:38:56 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-09-19 19:00:43 +0200 |
| commit | c829c10a74475ef6157408aa0e234b2a0fd43917 (patch) | |
| tree | 6a1d4d87eead2e11fc97654d540611b18fed6ce4 /gtk2_ardour | |
| parent | bd5b97e964d23bc51ef737ae239ab9822b254cbb (diff) | |
band-aid for Glib::operator<<
it seems that g_locale_from_utf8() (called by <<) is not thread safe,
at least not on OSX.
glib error-code 1, Invalid byte sequence in conversion input
-> throws Glib::Error.
possible fix for #6435, route-creation is interrupted via catch(...)
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/splash.cc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index bda775ed56..7e374f1c5a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1207,10 +1207,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt if (for_input) { io_count = route->n_inputs().n_total(); - tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name())); + tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()).c_str()); } else { 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()); } @@ -1244,12 +1244,12 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt } 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) { diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc index ff9e133eb0..409749d062 100644 --- a/gtk2_ardour/splash.cc +++ b/gtk2_ardour/splash.cc @@ -223,7 +223,7 @@ void Splash::message (const string& msg) { string str ("<b>"); - str += Glib::Markup::escape_text (msg); + str += Glib::Markup::escape_text (msg).c_str(); str += "</b>"; show (); |