From 2f31776ca6791ebb7680bef11314c11d4500531d Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 5 Jun 2020 16:52:22 +0200 Subject: [PATCH] #269 fix to makes it recognize slic3r++ config from gcode --- src/libslic3r/Config.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp index 11e740c1b..1c1832147 100644 --- a/src/libslic3r/Config.cpp +++ b/src/libslic3r/Config.cpp @@ -694,14 +694,16 @@ void ConfigBase::load_from_gcode_file(const std::string &file) boost::nowide::ifstream ifs(file); { const char slic3r_gcode_header[] = "; generated by Slic3r "; - const char slic3rpp_gcode_header[] = "; generated by SuperSlicer "; + const char slic3rpp_gcode_header[] = "; generated by Slic3r++ "; + const char superslicer_gcode_header[] = "; generated by SuperSlicer "; const char prusaslicer_gcode_header[] = "; generated by PrusaSlicer "; std::string firstline; std::getline(ifs, firstline); if (strncmp(slic3r_gcode_header, firstline.c_str(), strlen(slic3r_gcode_header)) != 0 && - strncmp(slic3rpp_gcode_header, firstline.c_str(), strlen(slic3rpp_gcode_header)) != 0&& + strncmp(slic3rpp_gcode_header, firstline.c_str(), strlen(slic3rpp_gcode_header)) != 0 && + strncmp(superslicer_gcode_header, firstline.c_str(), strlen(superslicer_gcode_header)) != 0 && strncmp(prusaslicer_gcode_header, firstline.c_str(), strlen(prusaslicer_gcode_header)) != 0) - throw std::runtime_error("Not a PrusaSlicer / Slic3r PE / SuperSlicer generated g-code."); + throw std::runtime_error("Not a PrusaSlicer / Slic3r / SuperSlicer generated g-code."); } ifs.seekg(0, ifs.end); auto file_length = ifs.tellg();