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/ardour_ui.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/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b55c50506e..e418e3c62f 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3480,7 +3480,7 @@ The following file was deleted from %2,\n\ releasing %3 %4bytes of disk space", "\ The following %1 files were deleted from %2,\n\ releasing %3 %4bytes of disk space", removed), - removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME)); + removed, Glib::Markup::escape_text (dead_directory).c_str(), space_adjusted, bprefix, PROGRAM_NAME)); } else { txt.set_markup (string_compose (P_("\ The following file was not in use and \n\ @@ -3493,7 +3493,7 @@ have been moved to: %2\n\n\ After a restart of %5\n\n\ <span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\ will release an additional %3 %4bytes of disk space.\n", removed), - removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME)); + removed, Glib::Markup::escape_text (dead_directory).c_str(), space_adjusted, bprefix, PROGRAM_NAME)); } dhbox.pack_start (*dimage, true, false, 5); |