From: Carl Hetherington <cth@carlh.net>
Date: Thu, 31 Oct 2019 21:21:02 +0000 (+0100)
Subject: Keep default export name even if the user changes the format (#1584).
X-Git-Tag: v2.15.29~13
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=92741805fa22ef549fd2001f984edc316d8b8619

Keep default export name even if the user changes the format (#1584).
---

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index b23583d44..65ce14092 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -56,6 +56,7 @@ ExportFormat formats[] = {
 
 ExportDialog::ExportDialog (wxWindow* parent, string name)
 	: TableDialog (parent, _("Export film"), 2, 1, true)
+	, _initial_name (name)
 {
 	add (_("Format"), true);
 	_format = new wxChoice (this, wxID_ANY);
@@ -78,7 +79,7 @@ ExportDialog::ExportDialog (wxWindow* parent, string name)
 
 	add (_("Output file"), true);
 	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false);
-	_file->SetPath (name);
+	_file->SetPath (_initial_name);
 	add (_file);
 
 	for (int i = 0; i < FORMATS; ++i) {
@@ -105,7 +106,7 @@ ExportDialog::format_changed ()
 {
 	DCPOMATIC_ASSERT (_format->GetSelection() >= 0 && _format->GetSelection() < FORMATS);
 	_file->SetWildcard (format_filters[_format->GetSelection()]);
-	_file->SetPath ("");
+	_file->SetPath (_initial_name);
 	_x264_crf->Enable (_format->GetSelection() == 1);
 	for (int i = 0; i < 2; ++i) {
 		_x264_crf_label[i]->Enable (_format->GetSelection() == 1);
diff --git a/src/wx/export_dialog.h b/src/wx/export_dialog.h
index 3314e22da..f1e893b53 100644
--- a/src/wx/export_dialog.h
+++ b/src/wx/export_dialog.h
@@ -40,6 +40,7 @@ private:
 	void format_changed ();
 	void file_changed ();
 
+	std::string _initial_name;
 	wxChoice* _format;
 	wxCheckBox* _mixdown;
 	wxCheckBox* _split_reels;