summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrun-tests.sh2
-rw-r--r--src/subtitle_asset.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.sh b/run-tests.sh
index b6064db3..3c92dae0 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -53,6 +53,8 @@ for d in `find build/test/libdcp-test -mindepth 1 -maxdepth 1 -type d`; do
fi
done
+sed -i "s/DCP: build\/test/DCP: \.\./g" build/test/info2.log
+
diff -q build/test/info2.log ../libdcp-test/info.log
if [ "$?" != "0" ]; then
echo "FAIL: dcpinfo output from rewrite incorrect"
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 9ba85a43..c7051eae 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -469,7 +469,7 @@ SubtitleAsset::write_xml (ostream& s) const
a << "Script=\"normal\" Underlined=\"no\" Weight=\"normal\"";
}
- if (first ||
+ if (first || font_changed ||
(last_in != (*i)->in() ||
last_out != (*i)->out() ||
last_fade_up_time != (*i)->fade_up_time() ||