From 5f19b624f444a8a2bbcf917a64b6c2ad29244450 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Tue, 6 May 2025 16:24:37 +0800
Subject: [PATCH] FIX:optimized AMS and EXT checks

jira:[STUDIO-11833]

Change-Id: I2c2756882897c878f2254a5c6fa8a31363af1bb0
(cherry picked from commit 32e3e8063653217987ec0dc5df4bad3468158490)
---
 src/slic3r/GUI/SelectMachine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index e7dec30d83..68ce89d6ac 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -2387,7 +2387,7 @@ static bool _HasExt(const std::vector<FilamentInfo> &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) {
+        if (info.ams_id == VIRTUAL_AMS_MAIN_ID_STR || info.ams_id == VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
             return true;
         }
     }
@@ -2397,7 +2397,7 @@ static bool _HasExt(const std::vector<FilamentInfo> &ams_mapping_result) {
 
 static bool _HasAms(const std::vector<FilamentInfo> &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) {
+        if (info.ams_id != VIRTUAL_AMS_MAIN_ID_STR && info.ams_id != VIRTUAL_AMS_DEPUTY_ID_STR && !info.ams_id.empty()) {
             return true;
         }
     }