Slightly hacky fix to make ImageSequenceDialog actually work.

2 files changed, 10 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 37ac15d07..778b2067f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-20  Carl Hetherington  <cth@carlh.net>
+
+	* Fix setting of frame rate when loading
+	image folders.
+
 2015-09-18  Carl Hetherington  <cth@carlh.net>
 
 	* Add another upmixer which is a simpler
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index bb0f365d6..7a93b5cd1 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -84,6 +84,11 @@ ImageExaminer::video_size () const
 optional<double>
 ImageExaminer::video_frame_rate () const
 {
+	if (_image_content->video_frame_rate() != 0) {
+		/* The content already knows what frame rate it should be */
+		return _image_content->video_frame_rate();
+	}
+
 	/* Don't know */
 	return optional<double> ();
 }