From: Carl Hetherington <cth@carlh.net>
Date: Sat, 7 Jan 2023 19:13:14 +0000 (+0100)
Subject: Remember paths in the add input dir picker in the combiner.
X-Git-Tag: v2.16.41~70
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e572ffd2e0bdc59cd00103a242d290d89e039c93

Remember paths in the add input dir picker in the combiner.
---

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5db5cf35f..e3325859f 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -189,6 +189,7 @@ Config::set_defaults ()
 	_initial_paths["AddFilesPath"] = boost::none;
 	_initial_paths["AddDKDMPath"] = boost::none;
 	_initial_paths["SelectCertificatePath"] = boost::none;
+	_initial_paths["AddCombinerInputPath"] = boost::none;
 	_use_isdcf_name_by_default = true;
 	_write_kdms_to_disk = true;
 	_email_kdms = false;
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index fb788ef6b..8e7337f65 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -19,6 +19,7 @@
 */
 
 
+#include "wx/dir_dialog.h"
 #include "wx/dir_picker_ctrl.h"
 #include "wx/editable_list.h"
 #include "wx/wx_signal_manager.h"
@@ -56,18 +57,23 @@ display_string (boost::filesystem::path p, int)
 }
 
 
-class DirDialogWrapper : public wxDirDialog
+class DirDialogWrapper : public DirDialog
 {
 public:
 	DirDialogWrapper (wxWindow* parent)
-		: wxDirDialog (parent, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST)
+		: DirDialog (parent, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddCombinerInputPath")
 	{
 
 	}
 
+	virtual int ShowModal() override
+	{
+		return DirDialog::show() ? wxID_OK : wxID_CANCEL;
+	}
+
 	optional<boost::filesystem::path> get () const
 	{
-		return boost::filesystem::path(wx_to_std(GetPath()));
+		return path();
 	}
 
 	void set (boost::filesystem::path)