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:24 +0100 |
| commit | 9d049dc062df1c134105ec6a042aa9f56ae9c067 (patch) | |
| tree | 9352048a6dfab2fea1716b549ecf953669a1ebb0 /src | |
| parent | 8276ed82237c30935962874c974e5462737fb0fb (diff) | |
Fix failure to save screen notes when making a new one (github bug #6).
Diffstat (limited to 'src')
| -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 829df2373..40990b684 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. @@ -58,8 +58,9 @@ namespace dcpomatic { 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 e00e882a4..166b22285 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -508,7 +508,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 7e012b522..8db7a1035 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -224,7 +224,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) { |