From 808a82300a8de5392c390e5f54bea20dafe7f964 Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Wed, 19 Oct 2022 09:03:32 +0800
Subject: [PATCH] FIX: only update ams list on selected machine

Change-Id: I7aac78ef1e10c0004651d3686f806d9d15d77d7a
---
 src/slic3r/GUI/GUI_App.cpp | 2 +-
 src/slic3r/GUI/Plater.cpp  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 699eaed811..a22bd387be 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1735,7 +1735,7 @@ void GUI_App::init_networking_callbacks()
 
                 if (obj) {
                     obj->parse_json(msg);
-                    if (obj->is_ams_need_update) {
+                    if (this->m_device_manager->get_selected_machine() == obj && obj->is_ams_need_update) {
                         GUI::wxGetApp().sidebar().load_ams_list(obj->amsList);
                     }
                 }
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index a7cee414a1..b91fcffb6f 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1254,6 +1254,8 @@ void Sidebar::load_ams_list(std::map<std::string, Ams *> const &list)
     for (auto ams : list) {
         for (auto tray : ams.second->trayList) {
             if (tray.second->setting_id.empty()) continue;
+            BOOST_LOG_TRIVIAL(info) << __FUNCTION__
+                                    << boost::format(": ams %1% tray %2% id %3% color %4%") % ams.first % tray.first % tray.second->setting_id % tray.second->color;
             DynamicPrintConfig ams;
             ams.set_key_value("filament_id", new ConfigOptionStrings{tray.second->setting_id});
             ams.set_key_value("filament_colour", new ConfigOptionStrings{"#" + tray.second->color.substr(0, 6)});