diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-17 15:36:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-17 15:36:00 +0100 |
| commit | 96858c88f15ad9deb260da295b2af3847b9b8e15 (patch) | |
| tree | 2f851a4092ba512da03f0dcc2965fc36875fbe6b /src/wx | |
| parent | ec275952569ea47a414991e2ce2b019d8189b3f1 (diff) | |
Check for conflicing refer-to-DCP settings.
This adds a general fix_conflicting_settings() to Film which should
fix the problem and give a message to tell the user why the "fix"
is being carried out. Should help with #929.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_editor.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 822ae286a..a5e1e82e9 100644 --- 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); |
