X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fexport_dialog.cc;h=5fc4036feddfce2df9b14bb97692dee26a5cf7a7;hb=95c48153421b1a6e0d7ca6cf5e67cd7623c03dc7;hp=b23583d44befba1bcd10a2d2d47c02fb5f72dd72;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3;p=dcpomatic.git

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index b23583d44..5fc4036fe 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);
@@ -77,8 +78,13 @@ ExportDialog::ExportDialog (wxWindow* parent, string name)
 	_x264_crf_label[1]->SetFont(font);
 
 	add (_("Output file"), true);
-	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false);
-	_file->SetPath (name);
+	/* Don't warn overwrite here, because on Linux (at least) if we specify a filename like foo
+	   the wxFileDialog will check that foo exists, but we will add an extension so we actually
+	   need to check if foo.mov (or similar) exists.  I can't find a way to make wxWidgets do this,
+	   so disable its check and the caller will have to do it themselves.
+	*/
+	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false, false);
+	_file->SetPath (_initial_name);
 	add (_file);
 
 	for (int i = 0; i < FORMATS; ++i) {
@@ -105,7 +111,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);