From: Carl Hetherington Date: Sat, 9 Jul 2022 18:39:10 +0000 (+0200) Subject: Be a bit more careful with content_factory(). X-Git-Tag: v2.16.17~4 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=70890b3f8e5e083be45016091a0e01c113d357dd Be a bit more careful with content_factory(). --- diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index c26186c55..57a5535c9 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -97,7 +97,10 @@ ContentView::update () 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") { - content = content_factory(i).front(); + auto all_content = content_factory(i); + if (!all_content.empty()) { + content = all_content.front(); + } } if (content) {