From: Carl Hetherington <cth@carlh.net>
Date: Tue, 27 Aug 2019 21:34:37 +0000 (+0100)
Subject: Slightly better errors when the player fails to load a DCP.
X-Git-Tag: v2.15.16~2
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=77d2514fee2919c32e4db92b8f75369754d17fb5

Slightly better errors when the player fails to load a DCP.
---

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 90cc818ca..cdacee784 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -464,6 +464,21 @@ public:
 
 private:
 
+	bool report_errors_from_last_job (wxWindow* parent) const
+	{
+		JobManager* jm = JobManager::instance ();
+
+		DCPOMATIC_ASSERT (!jm->get().empty());
+
+		shared_ptr<Job> last = jm->get().back();
+		if (last->finished_in_error()) {
+			error_dialog(parent, wxString::Format(_("Could not load DCP.\n\n%s."), std_to_wx(last->error_summary()).data()), std_to_wx(last->error_details()));
+			return false;
+		}
+
+		return true;
+	}
+
 	void setup_menu (wxMenuBar* m)
 	{
 		_file_menu = new wxMenu;
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index d2f463b73..045712bcb 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -530,19 +530,3 @@ display_progress (wxString title, wxString task)
 
 	return ok;
 }
-
-bool
-report_errors_from_last_job (wxWindow* parent)
-{
-	JobManager* jm = JobManager::instance ();
-
-	DCPOMATIC_ASSERT (!jm->get().empty());
-
-	shared_ptr<Job> last = jm->get().back();
-	if (last->finished_in_error()) {
-		error_dialog(parent, std_to_wx(last->error_summary()) + ".\n", std_to_wx(last->error_details()));
-		return false;
-	}
-
-	return true;
-}