diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index a7f2b4ed9e..d90c9cfb46 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -125,6 +125,7 @@ ExportHandler::ExportHandler (Session & session) ExportHandler::~ExportHandler () { if (export_status->aborted () && !current_timespan->vapor ().empty () && session.surround_master ()) { + Glib::Threads::Mutex::Lock l (export_status->lock()); session.surround_master ()->surround_return ()->finalize_export (); } graph_builder->cleanup (export_status->aborted () ); diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index e65f032a84..4714bbc741 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -21,6 +21,7 @@ */ #include +#include #include #include @@ -138,18 +139,14 @@ run_functor_for_paths (vector& result, } } catch (Glib::FileError const& err) { -#ifndef NDEBUG - warning << string_compose (_("Cannot access file: %1"), err.what()) << endmsg; -#endif + char errstr[PATH_MAX*2]; + snprintf (errstr, sizeof (errstr), "Cannot access file: %s", err.what().c_str()); + warning << errstr << endmsg; } catch (Glib::ConvertError const& err) { -#ifndef NDEBUG - warning << string_compose (_("Could not convert filename: %1"), err.what()) << endmsg; -#endif - } catch (...) { -#ifndef NDEBUG - warning << string_compose (_("Could not convert filename: '%1'"), *i) << endmsg; -#endif + char errstr[PATH_MAX*2]; + snprintf (errstr, sizeof (errstr), "Cannot convert filename: %s", err.what().c_str()); + warning << errstr << endmsg; } } }