GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-16 05:18:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash into GCodeTimeEstimator::post_process() while processing custom end g-code

Browse Source
This commit is contained in:
Enrico Turri 2019-10-02 09:38:19 +02:00
parent c5a5e6a61d
commit 6293ff8ccd
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/GCodeTimeEstimator.cpp
View File

@ -318,13 +318,23 @@ namespace Slic3r {
assert((g1_line_id >= (int)data->g1_line_ids.size()) || (data->g1_line_ids[g1_line_id].first >= g1_lines_count)); assert((g1_line_id >= (int)data->g1_line_ids.size()) || (data->g1_line_ids[g1_line_id].first >= g1_lines_count));
const Block* block = nullptr; const Block* block = nullptr;
#if ENABLE_GIT_3010_FIX
if (g1_line_id < (int)data->g1_line_ids.size())
{
const G1LineIdToBlockId& map_item = data->g1_line_ids[g1_line_id];
if (map_item.first == g1_lines_count)
#else
const G1LineIdToBlockId& map_item = data->g1_line_ids[g1_line_id]; const G1LineIdToBlockId& map_item = data->g1_line_ids[g1_line_id];
if ((g1_line_id < (int)data->g1_line_ids.size()) && (map_item.first == g1_lines_count)) if ((g1_line_id < (int)data->g1_line_ids.size()) && (map_item.first == g1_lines_count))
#endif // ENABLE_GIT_3010_FIX
{ {
if (line.has_e() && (map_item.second < (unsigned int)data->blocks.size())) if (line.has_e() && (map_item.second < (unsigned int)data->blocks.size()))
block = &data->blocks[map_item.second]; block = &data->blocks[map_item.second];
++g1_line_id; ++g1_line_id;
} }
#if ENABLE_GIT_3010_FIX
}
#endif // ENABLE_GIT_3010_FIX
if ((block != nullptr) && (block->elapsed_time != -1.0f)) if ((block != nullptr) && (block->elapsed_time != -1.0f))
{ {