3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GCodeAnalyzer: Fixed a crash when encountering an invalid toolchange

Browse source
This commit is contained in:
Enrico Turri 2019-09-11 08:39:29 +02:00
parent a62bba2508
commit 44c3493f7d
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/GCode/Analyzer.cpp
View file

@ -107,6 +107,11 @@ void GCodeAnalyzer::set_extruder_offsets(const GCodeAnalyzer::ExtruderOffsetsMap
m_extruder_offsets = extruder_offsets;
}
void GCodeAnalyzer::set_extruders_count(unsigned int count)
{
m_extruders_count = count;
}
void GCodeAnalyzer::set_gcode_flavor(const GCodeFlavor& flavor)
{
m_gcode_flavor = flavor;
@ -131,6 +136,7 @@ void GCodeAnalyzer::reset()
m_moves_map.clear();
m_extruder_offsets.clear();
m_extruders_count = 1;
}
const std::string& GCodeAnalyzer::process_gcode(const std::string& gcode)
@ -520,7 +526,10 @@ void GCodeAnalyzer::_processT(const std::string& cmd)
unsigned int id = (unsigned int)::strtol(cmd.substr(1).c_str(), nullptr, 10);
if (_get_extruder_id() != id)
{
_set_extruder_id(id);
if (id >= m_extruders_count)
BOOST_LOG_TRIVIAL(error) << "GCodeAnalyzer encountered an invalid toolchange, maybe from a custom gcode.";
else
_set_extruder_id(id);
// stores tool change move
_store_move(GCodeMove::Tool_change);