Allow optional override of the initial path taken from the key.

[dcpomatic.git] / src / wx / dir_dialog.cc

diff --git a/src/wx/dir_dialog.cc b/src/wx/dir_dialog.cc
index ec178de55361de1ab0f7a5656960d7a454f6a4bd..2c25cb6e8f5f057b904d1380d712624dec9c8a40 100644 (file)
--- a/src/wx/dir_dialog.cc
+++ b/src/wx/dir_dialog.cc
@@ -28,18 +28,23 @@
 
 
 using std::vector;
+using boost::optional;
 
 
 DirDialog::DirDialog(
        wxWindow* parent,
        wxString title,
        long style,
-       std::string initial_path_key
+       std::string initial_path_key,
+       optional<boost::filesystem::path> override_path
        )
        : wxDirDialog(
                parent,
                title,
-               std_to_wx(Config::instance()->initial_path(initial_path_key).get_value_or(home_directory()).string()),
+               std_to_wx(
+                       override_path.get_value_or(
+                               Config::instance()->initial_path(initial_path_key).get_value_or(home_directory())
+                               ).string()),
                style
                )
        , _initial_path_key(initial_path_key)