diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-03 02:29:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-03 02:29:48 +0100 |
| commit | 9ef42119694384a024104e9456e01d3c0e7bca2f (patch) | |
| tree | 0074eaba9a10b8dd39e7d77b5bb1dff181f1040d | |
| parent | 8c9194e9cf773af29aee3e5ad327478de62dac7e (diff) | |
Fix failure to save screen notes when making a new one (github bug #6).
| -rw-r--r-- | src/lib/screen.h | 7 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 2 | ||||
| -rw-r--r-- | src/wx/screens_panel.cc | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/screen.h b/src/lib/screen.h index eff2e5ffe..cfb45684b 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -56,8 +56,9 @@ private: class Screen { public: - Screen (std::string const & n, boost::optional<dcp::Certificate> rec, std::vector<TrustedDevice> td) - : name (n) + Screen (std::string const & na, std::string const & no, boost::optional<dcp::Certificate> rec, std::vector<TrustedDevice> td) + : name (na) + , notes (no) , recipient (rec) , trusted_devices (td) {} diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 21f9ec734..d0b60366b 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -505,7 +505,7 @@ int main (int argc, char* argv[]) { /* Make a new screen and add it to the current cinema */ dcp::CertificateChain chain (dcp::file_to_string(optarg)); - shared_ptr<Screen> screen (new Screen (screen_description, chain.leaf(), vector<TrustedDevice>())); + shared_ptr<Screen> screen (new Screen (screen_description, "", chain.leaf(), vector<TrustedDevice>())); if (cinema) { cinema->add_screen (screen); } diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index e89173eb2..4b0d50c16 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -223,7 +223,7 @@ ScreensPanel::add_screen_clicked () } } - shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices())); + shared_ptr<Screen> s (new Screen (d->name(), d->notes(), d->recipient(), d->trusted_devices())); c->add_screen (s); optional<wxTreeItemId> id = add_screen (c, s); if (id) { |