Merge branch 'master' into speed-up

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 563147f68bdf47a6dfce4d28e0dde22dbb1737ec..e2a4cbeda60efda1089f2b8e840c6a64940f5702 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1003,7 +1003,7 @@ Film::set_trust_content_header (bool t)
        
        signal_changed (TRUST_CONTENT_HEADER);
 
-       if (!_trust_content_header) {
+       if (!_trust_content_header) && !content().empty()) {
                /* We just said that we don't trust the content's header */
                examine_content ();
        }