From f14232396a49536fde86c6ac4cfd8d076250fbee Mon Sep 17 00:00:00 2001
From: Noisyfox <timemanager.rick@gmail.com>
Date: Sat, 5 Apr 2025 17:51:16 +0800
Subject: [PATCH] FIX: prevent dead loop of conflict checker (#9115)

jira: STUDIO-10282
Change-Id: I5722e9967cdd83cde5ef59aee37b0f7019e53d89
(cherry picked from commit b952006e4db49f00054cc2ac539074222c890d08)

Co-authored-by: Arthur <arthur.tang@bambulab.com>
---
 src/libslic3r/GCode/ConflictChecker.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libslic3r/GCode/ConflictChecker.cpp b/src/libslic3r/GCode/ConflictChecker.cpp
index fb69372a9a..5cb4cb4cf5 100644
--- a/src/libslic3r/GCode/ConflictChecker.cpp
+++ b/src/libslic3r/GCode/ConflictChecker.cpp
@@ -119,7 +119,9 @@ float LinesBucketQueue::getCurrBottomZ()
     }
 
     for (LinesBucket *bp : lowests) {
+        float prevZ = bp->curBottomZ();
         bp->raise();
+        if (bp->curBottomZ() == prevZ) continue;
         if (bp->valid()) { line_bucket_ptr_queue.push(bp); }
     }
     return layerBottomZ;