From 172f492b74dd896e1fc6bf92e50d001b2bf9eb74 Mon Sep 17 00:00:00 2001 From: Ian Chua Date: Tue, 15 Sep 2026 14:36:43 +0800 Subject: [PATCH] Revert "fix: latent ams in use bug" This reverts commit 910dbcd2e622e10c19ec4fa61e63da1201b4b4b3. (cherry picked from commit ba9cf6e897d5533b17f25122f1484441f1da65d8) --- src/slic3r/GUI/DeviceManager.hpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 6 +++-- src/slic3r/GUI/SendToPrinter.cpp | 42 +++++++++++++++++++++----------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index c4a63cb588..5c14e32f77 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -314,7 +314,7 @@ public: bool ams_support_virtual_tray { true }; time_t ams_user_setting_start = 0; time_t ams_switch_filament_start = 0; - AmsStatusMain ams_status_main = AmsStatusMain::AMS_STATUS_MAIN_IDLE; + AmsStatusMain ams_status_main; int ams_status_sub; int ams_version = 0; diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 5d51e5429f..8655443f3e 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -2378,7 +2378,9 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector 1) msg_text = wxString::Format(_L("Filament %s does not match the filament in AMS slot %s. Please update the printer firmware to support AMS slot assignment."), params[0], params[1]); @@ -2404,7 +2406,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector