Hand-apply 0ca0ab9f23ac0238643a6d148148385388f71c00 from master;

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

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 9a40a50749c80b9b96459d1737269a9d912db3e7..2932ee7c58bca7cd6da585f47b7fb5bb435f6a63 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -258,6 +258,7 @@ ContentPanel::add_folder_clicked ()
 {
        wxDirDialog* d = new wxDirDialog (_panel, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
        int const r = d->ShowModal ();
+       boost::filesystem::path const path (wx_to_std (d->GetPath ()));
        d->Destroy ();
        
        if (r != wxID_OK) {
@@ -267,10 +268,10 @@ ContentPanel::add_folder_clicked ()
        shared_ptr<Content> content;
        
        try {
-               content.reset (new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))));
+               content.reset (new ImageContent (_film, path));
        } catch (...) {
                try {
-                       content.reset (new DCPContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))));
+                       content.reset (new DCPContent (_film, path));
                } catch (...) {
                        error_dialog (_panel, _("Could not find any images nor a DCP in that folder"));
                        return;