diff --git a/xs/src/slic3r/GUI/Preset.cpp b/xs/src/slic3r/GUI/Preset.cpp index f3cedd693..e376a6ed2 100644 --- a/xs/src/slic3r/GUI/Preset.cpp +++ b/xs/src/slic3r/GUI/Preset.cpp @@ -505,6 +505,9 @@ Preset& PresetCollection::load_external_preset( // Insert a new profile. Preset &preset = this->load_preset(path, new_name, std::move(cfg), select); preset.is_external = true; + if (&this->get_selected_preset() == &preset) + this->get_edited_preset().is_external = true; + return preset; } diff --git a/xs/src/slic3r/GUI/Preset.hpp b/xs/src/slic3r/GUI/Preset.hpp index 5faee08f1..a2ee1d2eb 100644 --- a/xs/src/slic3r/GUI/Preset.hpp +++ b/xs/src/slic3r/GUI/Preset.hpp @@ -353,10 +353,6 @@ public: // Generate a file path from a profile name. Add the ".ini" suffix if it is missing. std::string path_from_name(const std::string &new_name) const; - // update m_edited_preset.is_external value after loading preset for .ini, .gcode, .amf, .3mf - void update_edited_preset_is_external(bool is_external) { - m_edited_preset.is_external = is_external; } - protected: // Select a preset, if it exists. If it does not exist, select an invalid (-1) index. // This is a temporary state, which shall be fixed immediately by the following step. diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/xs/src/slic3r/GUI/PresetBundle.cpp index adca1b153..b9a010659 100644 --- a/xs/src/slic3r/GUI/PresetBundle.cpp +++ b/xs/src/slic3r/GUI/PresetBundle.cpp @@ -565,12 +565,11 @@ void PresetBundle::load_config_file_config(const std::string &name_or_path, bool size_t idx = (i_group == 0) ? 0 : num_extruders + 1; inherits = inherits_values[idx]; compatible_printers_condition = compatible_printers_condition_values[idx]; - if (is_external) { + if (is_external) presets.load_external_preset(name_or_path, name, config.opt_string((i_group == 0) ? "print_settings_id" : "printer_settings_id", true), config); - presets.update_edited_preset_is_external(true); - } else + else presets.load_preset(presets.path_from_name(name), name, config).save(); } @@ -583,10 +582,9 @@ void PresetBundle::load_config_file_config(const std::string &name_or_path, bool // Split the "compatible_printers_condition" and "inherits" from the cummulative vectors to separate filament presets. inherits = inherits_values[1]; compatible_printers_condition = compatible_printers_condition_values[1]; - if (is_external) { + if (is_external) this->filaments.load_external_preset(name_or_path, name, old_filament_profile_names->values.front(), config); - this->filaments.update_edited_preset_is_external(true); - } else + else this->filaments.load_preset(this->filaments.path_from_name(name), name, config).save(); this->filament_presets.clear(); this->filament_presets.emplace_back(name); @@ -615,12 +613,11 @@ void PresetBundle::load_config_file_config(const std::string &name_or_path, bool cfg.opt_string("inherits", true) = inherits_values[i + 1]; // Load all filament presets, but only select the first one in the preset dialog. Preset *loaded = nullptr; - if (is_external) { + if (is_external) loaded = &this->filaments.load_external_preset(name_or_path, name, (i < old_filament_profile_names->values.size()) ? old_filament_profile_names->values[i] : "", std::move(cfg), i == 0); - this->filaments.update_edited_preset_is_external(true); - } else { + else { // Used by the config wizard when creating a custom setup. // Therefore this block should only be called for a single extruder. char suffix[64];