Fix loading of 1.x films.

diff --git a/ChangeLog b/ChangeLog
index 3f7bcbff47e93c0bedb40be3fe8648b517e6d240..4b5241d7ae6c29a5032b941ad0478dd8583aca00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-09-10  Carl Hetherington  <cth@carlh.net>
 
+       * Fix loading of 1.x films.
+
        * Fix crash on audio analysis in some cases.
 
 2014-09-09  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 24b4694e8572067be466c549a6ee8db20ba0a0e9..0e56619455b09613a7ada5229d0b932a2fe72e11 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -65,8 +65,13 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> f, cxml::ConstNodePtr n
        , _subtitle_y_offset (0)
        , _subtitle_scale (1)
 {
-       if (version >= 7) {
+       if (version >= 32) {
                _use_subtitles = node->bool_child ("UseSubtitles");
+       } else {
+               _use_subtitles = false;
+       }
+       
+       if (version >= 7) {
                _subtitle_x_offset = node->number_child<float> ("SubtitleXOffset");
                _subtitle_y_offset = node->number_child<float> ("SubtitleYOffset");
        } else {