Open file dialog starts in the configured DCP directory (#70).

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bf58b0852..43e9cd7df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-07  Carl Hetherington  <cth@carlh.net>
+
+	* Open file dialog starts in the configured DCP directory,
+	if one exists (#70).
+
 2013-11-06  Carl Hetherington  <cth@carlh.net>
 
 	* Support pixel format 30 (#254).
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index af620c5a2..1fea4fb1a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -354,7 +354,13 @@ private:
 
 	void file_open ()
 	{
-		wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
+		wxDirDialog* c = new wxDirDialog (
+			this,
+			_("Select film to open"),
+			std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()),
+			wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST
+			);
+		
 		int r;
 		while (1) {
 			r = c->ShowModal ();