From: Carl Hetherington Date: Tue, 24 Sep 2013 20:12:51 +0000 (+0100) Subject: KDM path fixes. X-Git-Tag: v2.0.48~1338 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=05687b49ec37e896ed7e493a587a78cd236f3aa1;p=dcpomatic.git KDM path fixes. --- diff --git a/src/lib/film.cc b/src/lib/film.cc index 708876151..07af46d97 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -961,8 +961,7 @@ Film::make_kdms ( ); boost::filesystem::path out = directory; - out /= tidy_for_filename ((*i)->cinema->name) + "_" + tidy_for_filename ((*i)->name); - out /= "kdm.xml"; + out /= tidy_for_filename ((*i)->cinema->name) + "_" + tidy_for_filename ((*i)->name) + ".kdm.xml"; kdm->write_to_file_formatted (out.string()); } } diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index c8212636a..f2fc53711 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "lib/cinema.h" #include "lib/config.h" #include "kdm_dialog.h" @@ -98,6 +99,8 @@ KDMDialog::KDMDialog (wxWindow* parent) _folder = new wxDirPickerCtrl (this, wxID_ANY); #endif + _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + table->Add (_folder, 1, wxEXPAND); vertical->Add (table, 0, wxEXPAND | wxALL, 6);