Merge.

diff --git a/ChangeLog b/ChangeLog
index 5e38fc74232130fa8f62681998cd33621caf3560..19cd66c71cb40c4cd8b142352f62a9179c45746d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Handle failure to write to cinemas file more nicely.
+
 2017-03-03  Carl Hetherington  <cth@carlh.net>
 
        * Add option to write KDMs to separate folders

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a7ef7d2a5c3384a338115cfb71f18e165758737d..f41d40e0931300ae9a8f648067a18154309a568c 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -368,12 +368,12 @@ Config::instance ()
 void
 Config::write () const
 {
-       write_config_xml ();
-       write_cinemas_xml ();
+       write_config ();
+       write_cinemas ();
 }
 
 void
-Config::write_config_xml () const
+Config::write_config () const
 {
        xmlpp::Document doc;
        xmlpp::Element* root = doc.create_root_node ("Config");
@@ -485,7 +485,7 @@ Config::write_config_xml () const
 }
 
 void
-Config::write_cinemas_xml () const
+Config::write_cinemas () const
 {
        xmlpp::Document doc;
        xmlpp::Element* root = doc.create_root_node ("Cinemas");

diff --git a/src/lib/config.h b/src/lib/config.h
index 5bd8df97d455d21a54d6da77ef3e49f56c59b48f..c02b12eb5456ec68ff66b08df9344b8bc9973fb6 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -66,6 +66,7 @@ public:
        enum Property {
                USE_ANY_SERVERS,
                SERVERS,
+               CINEMAS,
                OTHER
        };
 
@@ -349,12 +350,12 @@ public:
 
        void add_cinema (boost::shared_ptr<Cinema> c) {
                _cinemas.push_back (c);
-               changed ();
+               changed (CINEMAS);
        }
 
        void remove_cinema (boost::shared_ptr<Cinema> c) {
                _cinemas.remove (c);
-               changed ();
+               changed (CINEMAS);
        }
 
        void set_allowed_dcp_frame_rates (std::list<int> const & r) {
@@ -547,6 +548,8 @@ public:
        static boost::signals2::signal<void ()> FailedToLoad;
 
        void write () const;
+       void write_config () const;
+       void write_cinemas () const;
 
        void save_template (boost::shared_ptr<const Film> film, std::string name) const;
        bool existing_template (std::string name) const;
@@ -566,8 +569,6 @@ private:
        void read ();
        void set_defaults ();
        void set_kdm_email_to_default ();
-       void write_config_xml () const;
-       void write_cinemas_xml () const;
        void read_cinemas (cxml::Document const & f);
        boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
        boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 19e7707182d05b5f293da6c54a4ae86174752de8..92de9a1f0a0d3d49d4720abc2a466977a5707f3e 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -215,8 +215,8 @@ public:
                SetIcon (wxIcon (std_to_wx ("id")));
 #endif
 
-               _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this));
-               config_changed ();
+               _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
+               config_changed (Config::OTHER);
 
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_new, this),                ID_file_new);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_open, this),               ID_file_open);
@@ -278,9 +278,6 @@ public:
                wxAcceleratorTable accel_table (2, accel);
                SetAcceleratorTable (accel_table);
 
-               /* Instantly save any config changes when using the DCP-o-matic GUI */
-               Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ()));
-
                UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
        }
 
@@ -926,8 +923,35 @@ private:
                m->Append (help, _("&Help"));
        }
 
-       void config_changed ()
+       void config_changed (Config::Property what)
        {
+               /* Instantly save any config changes when using the DCP-o-matic GUI */
+               if (what == Config::CINEMAS) {
+                       try {
+                               Config::instance()->write_cinemas();
+                       } catch (exception& e) {
+                               error_dialog (
+                                       this,
+                                       wxString::Format (
+                                               _("Could not write to cinemas file at %s.  Your changes have not been saved."),
+                                               std_to_wx (Config::instance()->cinemas_file().string()).data()
+                                               )
+                                       );
+                       }
+               } else {
+                       try {
+                               Config::instance()->write_config();
+                       } catch (exception& e) {
+                               error_dialog (
+                                       this,
+                                       wxString::Format (
+                                               _("Could not write to config file at %s.  Your changes have not been saved."),
+                                               std_to_wx (Config::instance()->cinemas_file().string()).data()
+                                               )
+                                       );
+                       }
+               }
+
                for (int i = 0; i < _history_items; ++i) {
                        delete _file_menu->Remove (ID_file_history + i);
                }

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 3abe1f970cd925bfacc7c611a1c6c4cf70bd4b68..908e94f4dab8b0bbb5d2f46796705f0a76d63846 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -177,7 +177,7 @@ ScreensPanel::edit_cinema_clicked ()
                c.second->set_utc_offset_hour (d->utc_offset_hour ());
                c.second->set_utc_offset_minute (d->utc_offset_minute ());
                _targets->SetItemText (c.first, std_to_wx (d->name()));
-               Config::instance()->changed ();
+               Config::instance()->changed (Config::CINEMAS);
        }
 
        d->Destroy ();
@@ -229,7 +229,7 @@ ScreensPanel::add_screen_clicked ()
                _targets->Expand (id.get ());
        }
 
-       Config::instance()->changed ();
+       Config::instance()->changed (Config::CINEMAS);
 
        d->Destroy ();
 }
@@ -268,7 +268,7 @@ ScreensPanel::edit_screen_clicked ()
        s.second->recipient = d->recipient ();
        s.second->trusted_devices = d->trusted_devices ();
        _targets->SetItemText (s.first, std_to_wx (d->name()));
-       Config::instance()->changed ();
+       Config::instance()->changed (Config::CINEMAS);
 
        d->Destroy ();
 }
@@ -295,7 +295,7 @@ ScreensPanel::remove_screen_clicked ()
                _targets->Delete (i->first);
        }
 
-       Config::instance()->changed ();
+       Config::instance()->changed (Config::CINEMAS);
 }
 
 list<shared_ptr<Screen> >