ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-05-23 00:29:24 +02:00
commit a1a5f24ce6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/export_handler.cc
View File

@ -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 () );

17
libs/pbd/file_utils.cc
View File

@ -21,6 +21,7 @@
*/
#include <algorithm>
#include <climits>
#include <vector>
#include <glib.h>
@ -138,18 +139,14 @@ run_functor_for_paths (vector<string>& 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;
}
}
}