From 5d70958c557b11fb1f53a592f953d200175b9233 Mon Sep 17 00:00:00 2001
From: "hang.xu" <hang.xu@bambulab.com>
Date: Wed, 31 Jul 2024 18:01:54 +0800
Subject: [PATCH] FIX: the order of cans in AMSLite

jira: STUDIO-7765, STUDIO-7766, STUDIO-7767, STUDIO-7721, STUDIO-7713

Change-Id: If95e0667fc1d615c0494b007f7f7408f68e5b21c
(cherry picked from commit 9b510c0aeb4e9b8f26c285e1f6d5402852be1895)
---
 src/slic3r/GUI/StatusPanel.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 2a9d3b9a41..f95e13e8ec 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -3862,7 +3862,11 @@ void StatusPanel::on_ams_refresh_rfid(wxCommandEvent &event)
             return;
         }
 
-        std::string curr_ams_id = m_ams_control->GetCurentAms();
+        //std::string curr_ams_id = m_ams_control->GetCurentAms();
+        if (event.GetInt() < 0 || event.GetInt() > VIRTUAL_TRAY_MAIN_ID){
+            return;
+        }
+        std::string curr_ams_id = std::to_string(event.GetInt());
         // do not support refresh rfid for VIRTUAL_TRAY_MAIN_ID
         if (curr_ams_id.compare(std::to_string(VIRTUAL_TRAY_MAIN_ID)) == 0) {
             return;