FIX: Disable print button when gcode has conflict

Also fix a crash bug due to setStarted and setDone.

Change-Id: Ib9b069fe4b7e5d1fc359f48e44b4032dd8249428
(cherry picked from commit 9ef190ed3ecd66d12617ad96e927ff34251395a2)
This commit is contained in:
manch1n authored and Lane.Wei committed 2023-04-17 15:39:02 +08:00
1 parent e002885efc
commit d72b4c1bfe
9 files changed
+78 -8

No files matched your search

+3
View File
@@ -1097,6 +1097,9 @@ void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& pr
m_layers_slider->set_as_dirty();
m_moves_slider->set_as_dirty();
//BBS
m_conflict_result = gcode_result.conflict_result;
//BBS: add mutex for protection of gcode result
gcode_result.unlock();
//BBS: add logs