GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-02 05:50:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ConfigWizard: Fixed crashes on "Confirm configuration update"

Browse Source
This commit is contained in:
YuSanka 2024-05-24 13:25:48 +02:00 committed by David Kocik
parent d2d39db33a
commit 944e5f6d79
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -718,27 +718,28 @@ void PagePrinters::unselect_all_presets()
break; break;
} }
} }
assert(preset_bundle);
auto unselect = [preset_bundle](const std::string& vendor_id, const std::string& model, const std::string& variant) { if (preset_bundle) {
for (auto& preset : preset_bundle->printers) { auto unselect = [preset_bundle](const std::string& vendor_id, const std::string& model, const std::string& variant) {
if (preset.config.opt_string("printer_model") == model for (auto& preset : preset_bundle->printers) {
&& preset.config.opt_string("printer_variant") == variant) { if (preset.config.opt_string("printer_model") == model
preset.is_visible = false; && preset.config.opt_string("printer_variant") == variant) {
preset.is_visible = false;
}
} }
} };
};
// unselect presets in preset bundle, if related model and variant was checked in Picker // unselect presets in preset bundle, if related model and variant was checked in Picker
for (auto picker : printer_pickers) { for (auto picker : printer_pickers) {
for (const auto& cb : picker->cboxes) { for (const auto& cb : picker->cboxes) {
if (cb->GetValue()) if (cb->GetValue())
unselect(picker->vendor_id, cb->model, cb->variant); unselect(picker->vendor_id, cb->model, cb->variant);
} }
for (const auto& cb : picker->cboxes_alt) { for (const auto& cb : picker->cboxes_alt) {
if (cb->GetValue()) if (cb->GetValue())
unselect(picker->vendor_id, cb->model, cb->variant); unselect(picker->vendor_id, cb->model, cb->variant);
}
} }
} }
@ -3675,12 +3676,15 @@ void ConfigWizard::priv::load_pages_from_archive()
any_fff_selected = !only_sla_mode && check_fff_selected(); any_fff_selected = !only_sla_mode && check_fff_selected();
update_materials(T_ANY); update_materials(T_ANY);
if (!only_sla_mode) if (!page_filaments && !only_sla_mode) {
add_page(page_filaments = new PageMaterials(q, &filaments, add_page(page_filaments = new PageMaterials(q, &filaments,
_L("Filament Profiles Selection"), _L("Filaments"), _L("Type:"))); _L("Filament Profiles Selection"), _L("Filaments"), _L("Type:")));
}
add_page(page_sla_materials = new PageMaterials(q, &sla_materials, if (!page_sla_materials) {
_L("SLA Material Profiles Selection") + " ", _L("SLA Materials"), _L("Type:"))); add_page(page_sla_materials = new PageMaterials(q, &sla_materials,
_L("SLA Material Profiles Selection") + " ", _L("SLA Materials"), _L("Type:")));
}
load_pages(); load_pages();
} }