Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 822ae286a8f2989cc96db377fa9125eefcb8efff..edf5d3bd71fe9cfabb13ef37e86a6300bba8dc3a 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -32,10 +32,12 @@
 #include "content_panel.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
+#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::cout;
 using std::string;
+using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -75,6 +77,11 @@ FilmEditor::film_changed (Film::Property p)
                return;
        }
 
+       list<string> notes = _film->fix_conflicting_settings ();
+       BOOST_FOREACH (string i, notes) {
+               message_dialog (this, std_to_wx (i));
+       }
+
        _content_panel->film_changed (p);
        _dcp_panel->film_changed (p);
 
@@ -120,8 +127,8 @@ FilmEditor::set_film (shared_ptr<Film> film)
                _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2));
        }
 
-       if (_film) {
-               FileChanged (_film->directory ());
+       if (_film && _film->directory()) {
+               FileChanged (_film->directory().get());
        } else {
                FileChanged ("");
        }