X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=d02eb3ca5d3b3e68a6f5d26b87e1fd19ac14480d;hb=82b08e910e07bb571b11368124d49dc3d73e33ca;hp=55de4b1c706286b9503bb868fca3cbb4439a378f;hpb=96107588e0ddf383d21ff00b4d3febb313e43794;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 55de4b1c7..d02eb3ca5 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -517,7 +517,7 @@ maybe_show_splash ()
 	wxSplashScreen* splash = nullptr;
 	try {
 		wxBitmap bitmap;
-		if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) {
+		if (bitmap.LoadFile(bitmap_path("splash.png"), wxBITMAP_TYPE_PNG)) {
 			{
 				/* This wxMemoryDC must be destroyed before bitmap can be used elsewhere */
 				wxMemoryDC dc(bitmap);
@@ -646,7 +646,7 @@ bitmap_path (string name)
 	base = resources_path();
 #endif
 
-	auto p = base / String::compose("%1.png", name);
+	auto p = base / name;
 	return std_to_wx (p.string());
 }
 
@@ -700,3 +700,27 @@ search_ctrl_height ()
 #endif
 }
 
+
+void
+report_config_load_failure(wxWindow* parent, Config::LoadFailure what)
+{
+	switch (what) {
+	case Config::LoadFailure::CONFIG:
+		message_dialog(parent, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+		break;
+	case Config::LoadFailure::CINEMAS:
+		message_dialog(
+			parent,
+			_(wxString::Format("The cinemas list for creating KDMs (cinemas.xml) failed to load.  Please check the numbered backup files in %s",
+					   std_to_wx(Config::instance()->cinemas_file().parent_path().string())))
+			);
+		break;
+	case Config::LoadFailure::DKDM_RECIPIENTS:
+		message_dialog(
+			parent,
+			_(wxString::Format("The recipients list for creating DKDMs (dkdm_recipients.xml) failed to load.  Please check the numbered backup files in %s",
+					   std_to_wx(Config::instance()->dkdm_recipients_file().parent_path().string())))
+			);
+		break;
+	}
+}