summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-11-26 04:00:25 +0000
committerCarl Hetherington <cth@carlh.net>2013-11-26 04:00:25 +0000
commit9cd5745aebdb263bdf24afcc19823340c1809068 (patch)
tree8776fca9ba7a7e2c68bb4be5fb53b185496a55db /src
parent247b3423fcea1d4d20d797b48cdbaafa8dad1ea1 (diff)
Work around working directory error on Windows; bump libdcp.
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_editor.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 6a2aea18d..ef3534939 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -731,7 +731,10 @@ FilmEditor::setup_content ()
void
FilmEditor::content_add_file_clicked ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+ /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
+ non-Latin filenames or paths.
+ */
+ wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR);
int const r = d->ShowModal ();
if (r != wxID_OK) {