From a9ec42725927d6a0ccf318230dc4bbf9208c77bb Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Tue, 7 Nov 2023 18:44:39 +0800
Subject: [PATCH] FIX: upload custom root preset fail

Change-Id: I621c8d542dd604b07cc5df63d97d7a31558d3aba
Jira: none
---
 src/libslic3r/Preset.cpp   | 2 --
 src/slic3r/GUI/GUI_App.cpp | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 596fbd945..7f4fa3479 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -1295,8 +1295,6 @@ int PresetCollection::get_differed_values_to_update(Preset& preset, std::map<std
         {
             key_values[iter->first] = iter->second->serialize();
         }
-        if (!preset.filament_id.empty())
-            key_values[BBL_JSON_KEY_BASE_ID] = preset.filament_id;
     }
 
     //add other values
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index af0cb5cc7..1fe7a9dc8 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -4559,8 +4559,8 @@ void GUI_App::sync_preset(Preset* preset)
         if (!setting_id.empty()) {
             int ret = preset_bundle->get_differed_values_to_update(*preset, values_map);
             if (!ret) {
-                if (values_map[BBL_JSON_KEY_BASE_ID] == setting_id) {
-                    //clear the setting_id in this case
+                if (auto iter = values_map.find(BBL_JSON_KEY_BASE_ID); iter != values_map.end() && iter->second == setting_id) {
+                    //clear the setting_id in this case ???
                     setting_id.clear();
                     result = 0;
                 }