Fix recovery of partial video MXF.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index f59ccb0f5..650f8ac47 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -110,6 +110,13 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 	if (_film->encrypted ()) {
 		_picture_mxf->set_key (_film->key ());
 	}
+
+	_picture_mxf->set_file (
+		_film->internal_video_mxf_dir() / _film->internal_video_mxf_filename()
+		);
+
+	job->sub (_("Checking existing image data"));
+	check_existing_picture_mxf ();
 	
 	_picture_mxf_writer = _picture_mxf->start_write (
 		_film->internal_video_mxf_dir() / _film->internal_video_mxf_filename(),
@@ -135,9 +142,6 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 		throw InvalidSignerError ();
 	}
 
-	job->sub (_("Checking existing image data"));
-	check_existing_picture_mxf ();
-	
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 
 	job->sub (_("Encoding image data"));
diff --git a/test/recover_test.cc b/test/recover_test.cc
index e14832dce..e57674488 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (recover_test)
 		"build/test/recover_test/original.mxf"
 		);
 	
-//	boost::filesystem::resize_file (video, 2 * 1024 * 1024);
+	boost::filesystem::resize_file (video, 2 * 1024 * 1024);
 
 	film->make_dcp ();
 	wait_for_jobs ();