Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d

2018-08-08 12:52:02 +02:00 · 2018-08-08 12:52:02 +02:00 · 1764f3b57b
commit 1764f3b57b
parent ad92aa7486 93b8f3147c
1 changed files with 2 additions and 0 deletions
--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
@ -721,6 +721,8 @@ namespace Slic3r {
        }

        _last_st_synchronized_block_id = _blocks.size() - 1;
+        // The additional time has been consumed (added to the total time), reset it to zero.
+        set_additional_time(0.);
    }

    void GCodeTimeEstimator::_process_gcode_line(GCodeReader&, const GCodeReader::GCodeLine& line)