From: Carl Hetherington <cth@carlh.net>
Date: Tue, 23 Feb 2021 00:11:28 +0000 (+0100)
Subject: Fix some wxWidgets assertion failures.
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=d3a3b8988fcc7df405b8d73a0aabd967ad7a8bf0;hp=b6c2eb0a6ae72dd73c1d740e9941fc92d0e5b51d;p=dcpomatic.git

Fix some wxWidgets assertion failures.

Casued by specifying wxFD_OVERWRITE_PROMPT without wxFD_SAVE; it makes
no sense and in wx3.1 it raises an error.
---

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index e718844f1..3b07c7765 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -102,12 +102,12 @@ private:
 		++r;
 
 		add_label_to_sizer (table, _panel, _("Configuration file"), true, wxGBPosition (r, 0));
-		_config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true, true);
+		_config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true, false);
 		table->Add (_config_file, wxGBPosition (r, 1));
 		++r;
 
 		add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0));
-		_cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true, true);
+		_cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true, false);
 		table->Add (_cinemas_file, wxGBPosition (r, 1));
 		Button* export_cinemas = new Button (_panel, _("Export..."));
 		table->Add (export_cinemas, wxGBPosition (r, 2));
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 06a1ef56b..c32e892d9 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -123,12 +123,12 @@ private:
 		++r;
 
 		add_label_to_sizer (table, _panel, _("Activity log file"), true, wxGBPosition (r, 0));
-		_activity_log_file = new FilePickerCtrl (_panel, _("Select activity log file"), "*", true, true);
+		_activity_log_file = new FilePickerCtrl (_panel, _("Select activity log file"), "*", false, true);
 		table->Add (_activity_log_file, wxGBPosition(r, 1));
 		++r;
 
 		add_label_to_sizer (table, _panel, _("Debug log file"), true, wxGBPosition (r, 0));
-		_debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", true, true);
+		_debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", false, true);
 		table->Add (_debug_log_file, wxGBPosition(r, 1));
 		++r;