From 9c91341f6b1318b5d45872ff68e840a3b282487f Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Fri, 1 Sep 2023 10:06:45 +0800 Subject: [PATCH] FIX: cali - The progress bar should not be displayed. after the prompt box appears. Jira: 4288 Change-Id: I97f2073847877dcfe98d4a6faa5b09cf257a5c7c --- src/slic3r/GUI/CalibrationWizard.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index e98988743..4ced497cb 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -564,6 +564,7 @@ void PressureAdvanceWizard::on_cali_start() if (!wx_err_string.empty()) { MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); + return; } show_step(m_curr_step->next); @@ -625,6 +626,7 @@ void PressureAdvanceWizard::on_cali_start() if (!wx_err_string.empty()) { MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); + return; } preset_page->on_cali_start_job(); @@ -923,6 +925,7 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow if (!wx_err_string.empty()) { MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); + return; } show_step(m_curr_step->next); @@ -987,6 +990,7 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow if (!wx_err_string.empty()) { MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); + return; } preset_page->on_cali_start_job(); if (temp_filament_preset) @@ -1324,6 +1328,7 @@ void MaxVolumetricSpeedWizard::on_cali_start() if (!wx_err_string.empty()) { MessageDialog msg_dlg(nullptr, wx_err_string, wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); + return; } preset_page->on_cali_start_job();