juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup of previous commit

Browse Source
This commit is contained in:
Lukas Matena
2021-08-11 13:38:28 +02:00
parent 49ead341ba
commit 7e0a2644e2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/GCode/PostProcessor.cpp
View File

@@ -290,10 +290,11 @@ bool run_post_process_scripts(std::string &src_path, bool make_copy, const std::
f.close(); f.close();
if (host == "File") { if (host == "File") {
boost::filesystem::path op(new_output_name); namespace fs = boost::filesystem;
fs::path op(new_output_name);
if (op.is_relative() && op.has_filename() && op.parent_path().empty()) { if (op.is_relative() && op.has_filename() && op.parent_path().empty()) {
// Is this just a filename? Make it an absolute path. // Is this just a filename? Make it an absolute path.
auto outpath = boost::filesystem::path(output_name).parent_path(); auto outpath = fs::path(output_name).parent_path();
outpath /= op.string(); outpath /= op.string();
new_output_name = outpath.string(); new_output_name = outpath.string();
} }
@@ -301,8 +302,9 @@ bool run_post_process_scripts(std::string &src_path, bool make_copy, const std::
if (! op.is_absolute() || ! op.has_filename()) if (! op.is_absolute() || ! op.has_filename())
throw Slic3r::RuntimeError("Unable to parse desired new path from output name file"); throw Slic3r::RuntimeError("Unable to parse desired new path from output name file");
} }
if (! boost::filesystem::exists(op.parent_path())) if (! fs::exists(fs::path(new_output_name).parent_path()))
throw Slic3r::RuntimeError(Slic3r::format("Output directory does not exist: %1%", op.parent_path().string())); throw Slic3r::RuntimeError(Slic3r::format("Output directory does not exist: %1%",
fs::path(new_output_name).parent_path().string()));
} }
BOOST_LOG_TRIVIAL(trace) << "Post-processing script changed the file name from " << output_name << " to " << new_output_name; BOOST_LOG_TRIVIAL(trace) << "Post-processing script changed the file name from " << output_name << " to " << new_output_name;