From 92875709e1881fe3f374cd06321dacc3edbbd4c6 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 6 Jun 2018 12:01:11 +0200 Subject: [PATCH] Fixed a bug reporting incorrect compatible_printers and compatible_printers_condition inside the Config Bundle. --- xs/src/slic3r/GUI/PresetBundle.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/xs/src/slic3r/GUI/PresetBundle.cpp index 1427e5086..98d351069 100644 --- a/xs/src/slic3r/GUI/PresetBundle.cpp +++ b/xs/src/slic3r/GUI/PresetBundle.cpp @@ -840,17 +840,13 @@ size_t PresetBundle::load_configbundle(const std::string &path, unsigned int fla // Load the print, filament or printer preset. const DynamicPrintConfig &default_config = presets->default_preset().config; DynamicPrintConfig config(default_config); - std::vector config_keys = config.keys(); - // The following two keys are valid, but they are not mandatory. - config_keys.emplace_back("compatible_printers"); - config_keys.emplace_back("compatible_printers_condition"); for (auto &kvp : section.second) config.set_deserialize(kvp.first, kvp.second.data()); Preset::normalize(config); // Report configuration fields, which are misplaced into a wrong group. std::string incorrect_keys; size_t n_incorrect_keys = 0; - for (const std::string &key : config_keys) + for (const std::string &key : config.keys()) if (! default_config.has(key)) { if (incorrect_keys.empty()) incorrect_keys = key;