Merge remote-tracking branch 'origin/main' into v2.17.x

2 files changed, 17 insertions, 6 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index bd8582ea6..19d23c6cc 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -475,7 +475,7 @@ CertificateChainEditor::export_certificate ()
 	}
 	dcp::File f(path, "w");
 	if (!f) {
-		throw OpenFileError(path, errno, OpenFileError::WRITE);
+		throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
 	}
 
 	string const s = j->certificate(true);
@@ -500,7 +500,7 @@ CertificateChainEditor::export_chain ()
 	}
 	dcp::File f(path, "w");
 	if (!f) {
-		throw OpenFileError(path, errno, OpenFileError::WRITE);
+		throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
 	}
 
 	auto const s = _get()->chain();
@@ -621,7 +621,7 @@ CertificateChainEditor::export_private_key ()
 		}
 		dcp::File f(path, "w");
 		if (!f) {
-			throw OpenFileError (path, errno, OpenFileError::WRITE);
+			throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
 		}
 
 		auto const s = _get()->key().get ();
@@ -739,7 +739,7 @@ KeysPage::export_decryption_chain_and_key ()
 	boost::filesystem::path path(wx_to_std(d->GetPath()));
 	dcp::File f(path, "w");
 	if (!f) {
-		throw OpenFileError(path, errno, OpenFileError::WRITE);
+		throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
 	}
 
 	auto const chain = Config::instance()->decryption_chain()->chain();
@@ -773,7 +773,7 @@ KeysPage::import_decryption_chain_and_key ()
 
 	dcp::File f(wx_to_std(d->GetPath()), "r");
 	if (!f) {
-		throw OpenFileError(f.path(), errno, OpenFileError::WRITE);
+		throw OpenFileError(f.path(), f.open_error(), OpenFileError::WRITE);
 	}
 
 	string current;
@@ -838,7 +838,7 @@ KeysPage::export_decryption_certificate ()
 	}
 	dcp::File f(path, "w");
 	if (!f) {
-		throw OpenFileError(path, errno, OpenFileError::WRITE);
+		throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
 	}
 
 	auto const s = Config::instance()->decryption_chain()->leaf().certificate (true);
diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc
index 36cffa34d..a7afac7ff 100644
--- a/src/wx/supporters.cc
+++ b/src/wx/supporters.cc
@@ -19,6 +19,7 @@ supported_by.Add (wxT ("Paulo Abreu"));
 supported_by.Add (wxT ("Manuel AC"));
 supported_by.Add (wxT ("Festival international du cinéma francophone en Acadie"));
 supported_by.Add (wxT ("le Grand Action"));
+supported_by.Add (wxT ("Dollface Actual"));
 supported_by.Add (wxT ("ed Adamo"));
 supported_by.Add (wxT ("Scott Adderton"));
 supported_by.Add (wxT ("Éva Adorján"));
@@ -194,6 +195,7 @@ supported_by.Add (wxT ("Jean Luc Chevé"));
 supported_by.Add (wxT ("David Chien"));
 supported_by.Add (wxT ("Abundant Health Chiropractic"));
 supported_by.Add (wxT ("Georgy Cholakov"));
+supported_by.Add (wxT ("Lee Christiansen"));
 supported_by.Add (wxT ("Frank Cianciolo"));
 supported_by.Add (wxT ("Opificio Ciclope"));
 supported_by.Add (wxT ("Tahoe Art Haus And Cinema"));
@@ -379,6 +381,7 @@ supported_by.Add (wxT ("KulturKino Feuchtwangen"));
 supported_by.Add (wxT ("Lorenzo Fiale"));
 supported_by.Add (wxT ("Dean Fick"));
 supported_by.Add (wxT ("Marc Fiebig"));
+supported_by.Add (wxT ("Aglaja Filipovic"));
 supported_by.Add (wxT ("Moshel Film"));
 supported_by.Add (wxT ("Juli Film"));
 supported_by.Add (wxT ("Pató Film"));
@@ -599,6 +602,7 @@ supported_by.Add (wxT ("Melinda James"));
 supported_by.Add (wxT ("Luca Jankovic"));
 supported_by.Add (wxT ("Andy Jans-Brown"));
 supported_by.Add (wxT ("Mart Jansink"));
+supported_by.Add (wxT ("David Jenkins"));
 supported_by.Add (wxT ("Scott Jennings"));
 supported_by.Add (wxT ("Jonathan Jensen"));
 supported_by.Add (wxT ("Frank Jerkic"));
@@ -740,6 +744,7 @@ supported_by.Add (wxT ("Pedja Ljubojevic"));
 supported_by.Add (wxT ("Moon Atlas LLC"));
 supported_by.Add (wxT ("Pilotkino LLC"));
 supported_by.Add (wxT ("No Blood Of Mine LLC"));
+supported_by.Add (wxT ("Moving Picture Boys LLC"));
 supported_by.Add (wxT ("Pelidom LLC"));
 supported_by.Add (wxT ("Renaissance Entertainment LLC"));
 supported_by.Add (wxT ("Power Of Pearl Movie LLC"));
@@ -790,6 +795,7 @@ supported_by.Add (wxT ("Garry Maddison"));
 supported_by.Add (wxT ("Peter Maddock"));
 supported_by.Add (wxT ("Mat Made"));
 supported_by.Add (wxT ("Michael Madigan"));
+supported_by.Add (wxT ("Lanterna Magica"));
 supported_by.Add (wxT ("Peter Magnusson"));
 supported_by.Add (wxT ("Paolo Magris"));
 supported_by.Add (wxT ("Andrea Maguolo"));
@@ -1207,9 +1213,11 @@ supported_by.Add (wxT ("Raggio Verde Subtitles"));
 supported_by.Add (wxT ("Michael Suesterhenn"));
 supported_by.Add (wxT ("Christian Suhren"));
 supported_by.Add (wxT ("Frans Suijs"));
+supported_by.Add (wxT ("Sergey Sushinskiy"));
 supported_by.Add (wxT ("Spring Sutter"));
 supported_by.Add (wxT ("Sven"));
 supported_by.Add (wxT ("Phil Svitek"));
+supported_by.Add (wxT ("Marcin Świerczyński"));
 supported_by.Add (wxT ("Jürgen Swoboda"));
 supported_by.Add (wxT ("SymmetryFilms"));
 supported_by.Add (wxT ("Advanced Projection Systems"));
@@ -1240,6 +1248,7 @@ supported_by.Add (wxT ("Rodeo Drive-In Theatre"));
 supported_by.Add (wxT ("Ralph Thiekötter"));
 supported_by.Add (wxT ("Carlo Thiel"));
 supported_by.Add (wxT ("Nicholas Thiele"));
+supported_by.Add (wxT ("Mark Thomas"));
 supported_by.Add (wxT ("Jamie Thomas"));
 supported_by.Add (wxT ("Ade Thompson"));
 supported_by.Add (wxT ("Thorkell"));
@@ -1326,6 +1335,7 @@ supported_by.Add (wxT ("Paul Howard, WeMakeFilms"));
 supported_by.Add (wxT ("Mike Wendt"));
 supported_by.Add (wxT ("Frank Wenz"));
 supported_by.Add (wxT ("Anja Wenz"));
+supported_by.Add (wxT ("Olav Werner"));
 supported_by.Add (wxT ("Maik Wieczorek"));
 supported_by.Add (wxT ("Ralph Wiegandt"));
 supported_by.Add (wxT ("Johannes Wilbrand"));
@@ -1365,6 +1375,7 @@ supported_by.Add (wxT ("Peter Zeitlinger"));
 supported_by.Add (wxT ("Pavel Zhdanko"));
 supported_by.Add (wxT ("Chenliang Zhu"));
 supported_by.Add (wxT ("Daniel Židek"));
+supported_by.Add (wxT ("Hens Zimmerman"));
 supported_by.Add (wxT ("Ernst Zimmerman"));
 supported_by.Add (wxT ("Roberto Zin"));
 supported_by.Add (wxT ("Matthieu Zingle"));