From 50fdb74003afbce73c2efa9f8d8a35256cf9dd75 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 8 Apr 2025 21:43:05 +0800 Subject: [PATCH] ENH: show ams_backup while ams is used jira: [STUDIO-11329] Change-Id: I5fd21882b5318d4a4ce50ce0db12f07f1c6b6f69 (cherry picked from commit 6f3b3839e21ecb06392e7c0e8d0d87e63cc8d307) --- src/slic3r/GUI/SelectMachine.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 0449ac18f3..630c730a8d 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2534,6 +2534,14 @@ static bool _HasExt(const std::vector &ams_mapping_result) { return false; } +static bool _HasAms(const std::vector &ams_mapping_result) { + for (const auto &info : ams_mapping_result) { + if (info.ams_id != VIRTUAL_AMS_MAIN_ID_STR && info.ams_id != VIRTUAL_AMS_DEPUTY_ID_STR) { return true; } + } + + return false; +} + void SelectMachineDialog::on_send_print() { BOOST_LOG_TRIVIAL(info) << "print_job: on_ok to send"; @@ -3146,7 +3154,8 @@ void SelectMachineDialog::on_timer(wxTimerEvent &event) || !obj_->is_support_filament_backup || !obj_->is_support_show_filament_backup || !obj_->ams_auto_switch_filament_flag - || m_checkbox_list["use_ams"]->getValue() != "on") { + || m_checkbox_list["use_ams"]->getValue() != "on" + || !_HasAms(m_ams_mapping_result)) { if (m_ams_backup_tip->IsShown()) { m_ams_backup_tip->Hide(); img_ams_backup->Hide();