From 267e5cd9a9cd85c90fe80bdf14fead3923fd5489 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 14 Jul 2016 21:20:50 +0100
Subject: 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.
---
 src/tools/dcpomatic.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/tools')

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index f31464282..88310ad3e 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1006,6 +1006,8 @@ private:
 	{
 		wxInitAllImageHandlers ();
 
+		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+
 		wxSplashScreen* splash = 0;
 		try {
 			if (!Config::have_existing ("config.xml")) {
@@ -1175,6 +1177,11 @@ private:
 		}
 	}
 
+	void config_failed_to_load ()
+	{
+		message_dialog (_frame, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+	}
+
 	DOMFrame* _frame;
 	shared_ptr<wxTimer> _timer;
 	string _film_to_load;
-- 
cgit v1.2.3