Make player/KDM creator and main DCP-o-matic all behave the same with respect to problems when loading config.

3 files changed, 28 insertions, 26 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index a0dde813d..90c70abc2 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1177,19 +1177,7 @@ private:
 		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
 		Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
 
-		wxSplashScreen* splash = 0;
-		try {
-			if (!Config::have_existing ("config.xml")) {
-				wxBitmap bitmap;
-				boost::filesystem::path p = shared_path () / "splash.png";
-				if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
-					splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
-					wxYield ();
-				}
-			}
-		} catch (boost::filesystem::filesystem_error& e) {
-			/* Maybe we couldn't find the splash image; never mind */
-		}
+		wxSplashScreen* splash = maybe_show_splash ();
 
 		SetAppName (_("DCP-o-matic"));
 
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index ee2e87161..26e7f8479 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -42,11 +42,13 @@
 #include "lib/compose.hpp"
 #include "lib/cinema.h"
 #include "lib/dkdm_wrapper.h"
+#include "lib/cross.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
 #include <wx/preferences.h>
+#include <wx/splash.h>
 #include <wx/filepicker.h>
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
@@ -536,6 +538,11 @@ private:
 	{
 		wxInitAllImageHandlers ();
 
+		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+		Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+		wxSplashScreen* splash = maybe_show_splash ();
+
 		SetAppName (_("DCP-o-matic KDM Creator"));
 
 		if (!wxApp::OnInit()) {
@@ -575,6 +582,9 @@ private:
 		_frame = new DOMFrame (_("DCP-o-matic KDM Creator"));
 		SetTopWindow (_frame);
 		_frame->Maximize ();
+		if (splash) {
+			splash->Destroy ();
+		}
 		_frame->Show ();
 
 		signal_manager = new wxSignalManager (this);
@@ -628,6 +638,16 @@ private:
 		signal_manager->ui_idle ();
 	}
 
+	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."));
+	}
+
+	void config_warning (string m)
+	{
+		message_dialog (_frame, std_to_wx (m));
+	}
+
 	DOMFrame* _frame;
 };
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 1913a4b15..5ac01c348 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -414,20 +414,9 @@ private:
 		wxInitAllImageHandlers ();
 
 		Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+		Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
 
-		wxSplashScreen* splash = 0;
-		try {
-			if (!Config::have_existing ("config.xml")) {
-				wxBitmap bitmap;
-				boost::filesystem::path p = shared_path () / "splash.png";
-				if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
-					splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
-					wxYield ();
-				}
-			}
-		} catch (boost::filesystem::filesystem_error& e) {
-			/* Maybe we couldn't find the splash image; never mind */
-		}
+		wxSplashScreen* splash = maybe_show_splash ();
 
 		SetAppName (_("DCP-o-matic Player"));
 
@@ -561,6 +550,11 @@ private:
 		message_dialog (_frame, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
 	}
 
+	void config_warning (string m)
+	{
+		message_dialog (_frame, std_to_wx (m));
+	}
+
 	DOMFrame* _frame;
 	string _dcp_to_load;
 };