Merge master.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 6a37f30676472c51ec24866179ce5209cc5c2ec8..56c83d3f740c3343903ec6f02ed517681fc69a3d 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -44,7 +44,11 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
                                _paths.push_back (i->path ());
                        }
                }
-               
+
+               if (_paths.empty()) {
+                       throw FileError (_("No valid image files were found in the folder."), p);
+               }
+                               
                sort (_paths.begin(), _paths.end());
        }
 }
@@ -125,7 +129,7 @@ ImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
-       return DCPTime (video_length(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+       return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 string