Fix failure to save screen notes when making a new one (github bug #6).

diff --git a/src/lib/screen.h b/src/lib/screen.h
index 829df23739629e35bba3423c23e0ed055b5d56cb..40990b684e04a4f6eac4e86c717e749032977e4d 100644 (file)
--- 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 e00e882a4e2fbefbbdfa853d8f88efb24e7bb8e9..166b22285a741f8cd5cdc491982042c78d3f8f8a 100644 (file)
--- 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 7e012b522e3212fd1ccb0198b93e9e1001c743cb..8db7a10355f14400e806baa134cf8acd18f17dde 100644 (file)
--- 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) {