diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-26 04:00:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-26 04:00:25 +0000 |
| commit | 9cd5745aebdb263bdf24afcc19823340c1809068 (patch) | |
| tree | 8776fca9ba7a7e2c68bb4be5fb53b185496a55db | |
| parent | 247b3423fcea1d4d20d797b48cdbaafa8dad1ea1 (diff) | |
Work around working directory error on Windows; bump libdcp.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -4,7 +4,7 @@ import os def dependencies(target): return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), - ('libdcp', '2ee05f7ecc1847f1840610090ef3c093cf4a6554')) + ('libdcp', '66ea991028e62daf8bae5b6f1ad348c3eabe1da8')) def build(target): cmd = './waf configure --prefix=%s' % target.work_dir_cscript() 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) { |