FIX: upload custom root preset fail
Change-Id: I621c8d542dd604b07cc5df63d97d7a31558d3aba Jira: none
This commit is contained in:
parent
cad6a53a30
commit
a9ec427259
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue