From 851cdad5f3402bca182219e9ecb512cbf42674fb Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Tue, 10 Jan 2023 14:57:16 +0800
Subject: [PATCH] FIX: [STUDIO-1933] show ams filament as Generic type if id
 not found

Change-Id: I5ffd499ea16275479c6685dc6795ad240f59fa37
---
 src/slic3r/GUI/PresetComboBoxes.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp
index 09346adc6..e29d46e45 100644
--- a/src/slic3r/GUI/PresetComboBoxes.cpp
+++ b/src/slic3r/GUI/PresetComboBoxes.cpp
@@ -378,6 +378,11 @@ void PresetComboBox::add_ams_filaments(std::string selected, bool alias_name)
             std::string filament_id = f.opt_string("filament_id", 0u);
             auto iter = std::find_if(filaments.begin(), filaments.end(),
                 [&filament_id](auto &f) { return f.is_compatible && f.is_system && f.filament_id == filament_id; });
+            if (iter == filaments.end()) {
+                auto filament_type = "Generic " + f.opt_string("filament_type", 0u);
+                iter               = std::find_if(filaments.begin(), filaments.end(),
+                                    [&filament_type](auto &f) { return f.is_compatible && f.is_system && boost::algorithm::starts_with(f.name, filament_type); });
+            }
             if (iter == filaments.end()) {
                 BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(": filament_id %1% not found or system or compatible") % filament_id;
                 continue;