X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=f9a772e00126c5d49162442ff68c5559820764bb;hb=7258a88930092beffa14afeb581a61985c72fd3d;hp=eb8b35210efd4a2a65cd4a4e02380438b3f05ba1;hpb=fc45861c622ed38f479265e63abc220444e54b61;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index eb8b35210..f9a772e00 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -29,6 +29,8 @@
 
 #include "i18n.h"
 
+#include "image_filename_sorter.cc"
+
 using std::string;
 using std::cout;
 using boost::shared_ptr;
@@ -38,7 +40,7 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, VideoContent (f)
 {
 	bool have_j2k = false;
-	if (boost::filesystem::is_regular_file (p)) {
+	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
 		_paths.push_back (p);
 		if (valid_j2k_file (p)) {
 			have_j2k = true;
@@ -57,7 +59,7 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
 			throw FileError (_("No valid image files were found in the folder."), p);
 		}
 		       		
-		sort (_paths.begin(), _paths.end());
+		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
 	}
 
 	if (have_j2k) {