X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.cc;h=80256987971e654e6e1bdeb49c193e5cc94de80d;hb=736d6bf3242a0ba3841cb765e97cf9fee3540460;hp=7a20cc3445f121f265f6de61a87e167767de5e59;hpb=313319ba2d8544bc25524e02e634804a503b54f1;p=dcpomatic.git

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 7a20cc344..802569879 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -29,9 +29,12 @@
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
 #include <dcp/exceptions.h>
+#include <dcp/warnings.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/progdlg.h>
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;
@@ -92,9 +95,12 @@ ContentView::update ()
 
 			shared_ptr<Content> content;
 			if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
-				content.reset (new DCPContent(i));
-			} else if (i.path().extension() == ".mp4" || i.path().extension() == ".ecinema") {
-				content = content_factory(i).front();
+				content = make_shared<DCPContent>(i);
+			} else if (i.path().extension() == ".mp4") {
+				auto all_content = content_factory(i);
+				if (!all_content.empty()) {
+					content = all_content.front();
+				}
 			}
 
 			if (content) {