diff options
| -rw-r--r-- | xs/src/slic3r/GUI/ConfigWizard.cpp | 1 | ||||
| -rw-r--r-- | xs/src/slic3r/GUI/PresetBundle.cpp | 2 | ||||
| -rw-r--r-- | xs/src/slic3r/Utils/PresetUpdater.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/xs/src/slic3r/GUI/ConfigWizard.cpp index 0c42168bb..da75f4f30 100644 --- a/xs/src/slic3r/GUI/ConfigWizard.cpp +++ b/xs/src/slic3r/GUI/ConfigWizard.cpp @@ -788,7 +788,6 @@ void ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese app_config->set("version_check", page_update->version_check ? "1" : "0"); app_config->set("preset_update", page_update->preset_update ? "1" : "0"); app_config->reset_selections(); - // ^ TODO: replace with appropriate printer selection preset_bundle->load_presets(*app_config); } else { for (ConfigWizardPage *page = page_firmware; page != nullptr; page = page->page_next()) { diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/xs/src/slic3r/GUI/PresetBundle.cpp index b9a010659..58553e1bc 100644 --- a/xs/src/slic3r/GUI/PresetBundle.cpp +++ b/xs/src/slic3r/GUI/PresetBundle.cpp @@ -268,7 +268,7 @@ void PresetBundle::load_installed_printers(const AppConfig &config) } // Load selections (current print, current filaments, current printer) from config.ini -// This is done just once on application start up. +// This is done on application start up or after updates are applied. void PresetBundle::load_selections(const AppConfig &config) { // Update visibility of presets based on application vendor / model / variant configuration. diff --git a/xs/src/slic3r/Utils/PresetUpdater.cpp b/xs/src/slic3r/Utils/PresetUpdater.cpp index b5eab115b..c962a2c82 100644 --- a/xs/src/slic3r/Utils/PresetUpdater.cpp +++ b/xs/src/slic3r/Utils/PresetUpdater.cpp @@ -570,6 +570,7 @@ bool PresetUpdater::config_update() const if (! wizard.run(GUI::get_preset_bundle(), this)) { return false; } + GUI::load_current_presets(); } else { BOOST_LOG_TRIVIAL(info) << "User wants to exit Slic3r, bye..."; return false; @@ -599,7 +600,6 @@ bool PresetUpdater::config_update() const // Reload global configuration auto *app_config = GUI::get_app_config(); - app_config->reset_selections(); GUI::get_preset_bundle()->load_presets(*app_config); GUI::load_current_presets(); } else { |