From 983cb99da828856d867eb0dd984eadb5c5a7f48f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 2 Feb 2026 19:19:41 +0100 Subject: Catch another exception from create_hard_link on Windows. This is attempt to fix an uncaught "Fonction incorrecte" when using the combiner. --- src/combine.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/combine.cc b/src/combine.cc index dfdf8b1b..e84b59a8 100644 --- a/src/combine.cc +++ b/src/combine.cc @@ -49,6 +49,7 @@ #include "raw_convert.h" #include #include +#include #include #include #include @@ -89,7 +90,13 @@ create_hard_link_or_copy(boost::filesystem::path from, boost::filesystem::path t try { dcp::filesystem::create_hard_link(from, to); } catch (boost::filesystem::filesystem_error& e) { - if (e.code() == boost::system::errc::cross_device_link || e.code() == boost::system::errc::operation_not_supported) { + if ( + e.code() == boost::system::errc::cross_device_link || +#ifdef LIBDCP_WINDOWS + e.code() == boost::system::windows_error::invalid_function || +#endif + e.code() == boost::system::errc::operation_not_supported + ) { dcp::filesystem::copy_file(from, to); } else { throw; -- cgit v1.2.3