From 05687b49ec37e896ed7e493a587a78cd236f3aa1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 24 Sep 2013 21:12:51 +0100
Subject: [PATCH] KDM path fixes.

---
 src/lib/film.cc      | 3 +--
 src/wx/kdm_dialog.cc | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

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 <wx/treectrl.h>
 #include <wx/datectrl.h>
 #include <wx/timectrl.h>
+#include <wx/stdpaths.h>
 #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);
-- 
2.30.2