From 54b8fab63a4b39e164be9e66a42e9ec80047d7dd Mon Sep 17 00:00:00 2001
From: "zhimin.zeng" <zhimin.zeng@bambulab.com>
Date: Thu, 9 Jan 2025 16:44:21 +0800
Subject: [PATCH] FIX: fix bug when enable timelapse

1. the error start position after filament change
2. the error wall depth print with tpu
jira: none

Change-Id: I26d4e1c5c5c3bcae14555f9a875485435cdd6b97
(cherry picked from commit 753e2ac70870b43d52fa28437b9cc3cc0e174624)
---
 src/libslic3r/GCode/WipeTower.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp
index 10f460bbbd..7477ee9507 100644
--- a/src/libslic3r/GCode/WipeTower.cpp
+++ b/src/libslic3r/GCode/WipeTower.cpp
@@ -3085,10 +3085,11 @@ void WipeTower::generate_new(std::vector<std::vector<WipeTower::ToolChangeResult
         if (layer_result.empty()) {
             // there is nothing to merge finish_layer with
             layer_result.emplace_back(std::move(finish_layer_tcr));
-        } else {
+        }
+        else if (is_valid_gcode(finish_layer_tcr.gcode)) {
             if (insert_finish_layer_idx == -1)
                 layer_result[0] = merge_tcr(finish_layer_tcr, layer_result[0]);
-            else if (is_valid_gcode(finish_layer_tcr.gcode))
+            else
                 layer_result[insert_finish_layer_idx] = merge_tcr(layer_result[insert_finish_layer_idx], finish_layer_tcr);
         }
 
@@ -3237,7 +3238,7 @@ WipeTower::ToolChangeResult WipeTower::only_generate_out_wall(bool is_new_mode)
 
     float wipe_tower_depth = m_layer_info->depth + m_perimeter_width;
     if (is_new_mode && m_enable_timelapse_print)
-        wipe_tower_depth = m_wipe_tower_width;
+        wipe_tower_depth = m_wipe_tower_depth;
     box_coordinates wt_box(Vec2f(0.f, (m_current_shape == SHAPE_REVERSED ? m_layer_info->toolchanges_depth() : 0.f)), m_wipe_tower_width, wipe_tower_depth);
     wt_box = align_perimeter(wt_box);
     if (m_use_gap_wall)