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 edf5d3bd71fe9cfabb13ef37e86a6300bba8dc3a..5380cbd9bed582cd7716ade2096b7c5c34dc2065 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -41,7 +41,6 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 
-/** @param f Film to edit */
 FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
        : wxPanel (parent)
 {
@@ -77,11 +76,6 @@ 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);