From 2d9ad1b7bb17ae209aab7f85eb9d850bfead265f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jun 2020 22:47:28 +0200 Subject: [PATCH] Fix hanging butler due to nasty signal ordering problems. --- src/lib/dcp_content.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 66f5331b0..ec6894428 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -240,8 +240,11 @@ DCPContent::examine (shared_ptr film, shared_ptr job) boost::mutex::scoped_lock lm (_mutex); atmos.reset (new AtmosContent(this)); } - atmos->set_length (examiner->atmos_length()); + /* Setting length will cause calculations to be made based on edit rate, so that must + * be set up first otherwise hard-to-spot exceptions will be thrown. + */ atmos->set_edit_rate (examiner->atmos_edit_rate()); + atmos->set_length (examiner->atmos_length()); } int texts = 0; -- 2.30.2