diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-06 02:37:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-09 01:21:22 +0200 |
| commit | f0f4dd5e6b6ed5e50d0444a4de3b2a13156edf64 (patch) | |
| tree | dce96c211c6d92062187e8c40026c04a26af72e9 /src/wx/content_panel.cc | |
| parent | 89e39ea9e20bc4f8e88e42a57d4505e1fa69fde5 (diff) | |
Use dcp::filesystem to wrap filesystem calls and fix_long_path2623-add-windows
anything that is passed to read_file() from libcxml.
This should fix #2623 and other similar problems.
Diffstat (limited to 'src/wx/content_panel.cc')
| -rw-r--r-- | src/wx/content_panel.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index fadcade31..56c1d0524 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -51,6 +51,7 @@ #include "lib/string_text_file_content.h" #include "lib/text_content.h" #include "lib/video_content.h" +#include <dcp/filesystem.h> #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <wx/display.h> @@ -152,9 +153,9 @@ public: vector<boost::filesystem::path> folders; for (size_t i = 0; i < filenames.GetCount(); ++i) { auto path = boost::filesystem::path(wx_to_std(filenames[i])); - if (boost::filesystem::is_regular_file(path)) { + if (dcp::filesystem::is_regular_file(path)) { files.push_back(path); - } else if (boost::filesystem::is_directory(path)) { + } else if (dcp::filesystem::is_directory(path)) { if (contains_assetmap(path)) { dcps.push_back(path); } else { |