Work around working directory error on Windows; bump libdcp.

diff --git a/cscript b/cscript
index e4f9859b90a396f9804d47de66e339525ca22f38..5757164a9631ecef6f05ecfe588bde51b7068dc2 100644 (file)
--- a/cscript
+++ b/cscript
@@ -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 6a2aea18d0655d6cc36f163b09e238a0adf10b25..ef35349390573e356ed463ed64581d64f4be22a8 100644 (file)
--- 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) {