From 3c3f42797d7b0c30d0d38bbc0c571a2531841a9c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 9 Jul 2024 10:03:10 +0200
Subject: Fix too-late setup of path encoding stuff.

---
 src/tools/dcpomatic_cli.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 5a7ec3c72..79d9bbe1c 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -263,6 +263,9 @@ main (int argc, char* argv[])
 	ArgFixer fixer(argc, argv);
 	auto const program_name = fixer.argv()[0];
 
+	dcpomatic_setup_path_encoding ();
+	dcpomatic_setup ();
+
 	boost::filesystem::path film_dir;
 	bool progress = true;
 	bool no_remote = false;
@@ -412,8 +415,6 @@ main (int argc, char* argv[])
 
 	film_dir = fixer.argv()[optind];
 
-	dcpomatic_setup_path_encoding ();
-	dcpomatic_setup ();
 	signal_manager = new SignalManager ();
 
 	if (no_remote || export_format) {
-- 
cgit v1.2.3


From bcb7cda686bd428b8367b87343aae8356b4a5bf8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 9 Jul 2024 11:40:49 +0200
Subject: Supporters update.

---
 src/wx/subscribers.cc | 1 -
 src/wx/supporters.cc  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wx/subscribers.cc b/src/wx/subscribers.cc
index 868fc21b0..8fd535462 100644
--- a/src/wx/subscribers.cc
+++ b/src/wx/subscribers.cc
@@ -15,7 +15,6 @@ subscribers.Add (wxT ("Zbigniew Kamiński"));
 subscribers.Add (wxT ("Timm Kröger"));
 subscribers.Add (wxT ("Carlos Lagido"));
 subscribers.Add (wxT ("Ross Meyer"));
-subscribers.Add (wxT ("Owen Morgan"));
 subscribers.Add (wxT ("Austrian Film Museum"));
 subscribers.Add (wxT ("LightBender Post"));
 subscribers.Add (wxT ("Irving Shapiro"));
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index a2b53251e..3a5a985b8 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -878,6 +878,7 @@ supported_by.Add (wxT ("Pierre-Jean Moreau"));
 supported_by.Add (wxT ("Stanislas Moreau"));
 supported_by.Add (wxT ("Ted Morée"));
 supported_by.Add (wxT ("Daniel Morez"));
+supported_by.Add (wxT ("Owen Morgan"));
 supported_by.Add (wxT ("Paolo Morini"));
 supported_by.Add (wxT ("Lars Moritz"));
 supported_by.Add (wxT ("Lindsay Morris"));
@@ -1357,9 +1358,11 @@ supported_by.Add (wxT ("Ernst Zimmerman"));
 supported_by.Add (wxT ("Roberto Zin"));
 supported_by.Add (wxT ("Matthieu Zingle"));
 supported_by.Add (wxT ("Allard Zoetman"));
+supported_by.Add (wxT ("ZOOLOOK"));
 supported_by.Add (wxT ("Vincent Zorzi"));
 supported_by.Add (wxT ("Juan Zubillaga"));
 supported_by.Add (wxT ("Jack Zullo"));
+supported_by.Add (wxT ("Jan Zuska"));
 supported_by.Add (wxT ("Camera Zwo"));
 supported_by.Add (wxT ("Юров Александр"));
 supported_by.Add (wxT ("Огрызков Алексей"));
-- 
cgit v1.2.3