Fix writing of LoadFont tags in subtitles.

[dcpomatic.git] / src / lib / writer.cc

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 5699536416cac0df3bbe9a38be51b46a6ab483db..d2116362edd157359acf079b5fe17f595028ef62 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -505,18 +505,6 @@ Writer::finish ()
        }
 
        if (_subtitle_content) {
-               _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ());
-               reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
-                                  new dcp::ReelSubtitleAsset (
-                                          _subtitle_content,
-                                          dcp::Fraction (_film->video_frame_rate(), 1),
-                                          _picture_mxf->intrinsic_duration (),
-                                          0
-                                          )
-                                  ));
-               
-               dcp.add (_subtitle_content);
-
                boost::filesystem::path const liberation = shared_path () / "LiberationSans-Regular.ttf";
 
                /* Add all the fonts to the subtitle content and as assets to the DCP */
@@ -534,6 +522,18 @@ Writer::finish ()
                                LOG_WARNING_NC (String::compose ("Could not copy font %1 to DCP", from.string ()));
                        }
                }
+
+               _subtitle_content->write_xml (_film->dir (_film->dcp_name ()) / _film->subtitle_xml_filename ());
+               reel->add (shared_ptr<dcp::ReelSubtitleAsset> (
+                                  new dcp::ReelSubtitleAsset (
+                                          _subtitle_content,
+                                          dcp::Fraction (_film->video_frame_rate(), 1),
+                                          _picture_mxf->intrinsic_duration (),
+                                          0
+                                          )
+                                  ));
+               
+               dcp.add (_subtitle_content);
        }
        
        cpl->add (reel);