Better behaviour if config fails to load.

Create a default config if any exception is thrown by ::read, and
tell the UI so that it can pop up a message to say what has happened.

2 files changed, 19 insertions, 9 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index c483734f8..c6c6cac8b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -59,6 +59,7 @@ using boost::optional;
 using boost::algorithm::trim;
 
 Config* Config::_instance = 0;
+boost::signals2::signal<void ()> Config::FailedToLoad;
 
 /** Construct default configuration */
 Config::Config ()
@@ -143,16 +144,8 @@ Config::create_certificate_chain ()
 
 void
 Config::read ()
+try
 {
-	if (!have_existing ("config.xml")) {
-		/* Make a new set of signing certificates and key */
-		_signer_chain = create_certificate_chain ();
-		/* And similar for decryption of KDMs */
-		_decryption_chain = create_certificate_chain ();
-		write ();
-		return;
-	}
-
 	cxml::Document f ("Config");
 	f.read_file (path ("config.xml"));
 	optional<string> c;
@@ -305,6 +298,19 @@ Config::read ()
 		read_cinemas (f);
 	}
 }
+catch (...) {
+	if (have_existing ("config.xml")) {
+		/* We have a config file but it didn't load */
+		FailedToLoad ();
+	}
+	set_defaults ();
+	/* Make a new set of signing certificates and key */
+	_signer_chain = create_certificate_chain ();
+	/* And similar for decryption of KDMs */
+	_decryption_chain = create_certificate_chain ();
+	write ();
+}
+
 
 /** @return Filename to write configuration to */
 boost::filesystem::path
diff --git a/src/lib/config.h b/src/lib/config.h
index feaac8390..61c6bfa69 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -483,6 +483,10 @@ public:
 
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
+	/** Emitted if ::read() failed on an existing Config file.  There is nothing
+	    a listener can do about it: this is just for information.
+	*/
+	static boost::signals2::signal<void ()> FailedToLoad;
 
 	void write () const;