From 4743bb988b2d60e235da7027dddb90032812e335 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Sep 2014 09:22:50 +0100 Subject: Fix loading of 1.x films. --- ChangeLog | 2 ++ src/lib/subtitle_content.cc | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f7bcbff4..4b5241d7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-09-10 Carl Hetherington + * Fix loading of 1.x films. + * Fix crash on audio analysis in some cases. 2014-09-09 Carl Hetherington diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 24b4694e8..0e5661945 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -65,8 +65,13 @@ SubtitleContent::SubtitleContent (shared_ptr 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 ("SubtitleXOffset"); _subtitle_y_offset = node->number_child ("SubtitleYOffset"); } else { -- cgit v1.2.3