From e13e6c78970ad0934409dd50d7ef50cd4ba21a6d Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Thu, 15 May 2025 21:01:44 +0800 Subject: [PATCH] FIX:update_all_preset_comboboxes shoulld not return jira: STUDIO-12045 Change-Id: Ie507a87f9be6b95350603231a4ef7ee5596f5fdf (cherry picked from commit 1541e256f9c858d3e33d5d31d4881e6ebf38e5b7) --- src/slic3r/GUI/Plater.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 4f237bc322..45186bc0ed 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2238,21 +2238,23 @@ void Sidebar::update_all_preset_comboboxes() // Orca: don't update bed type if loading project if (!p->plater->is_loading_project()) { bool has_changed = reset_bed_type_combox_choices(); - if (m_begin_sync_printer_status && !has_changed) { - return; - } - auto str_bed_type = wxGetApp().app_config->get_printer_setting(wxGetApp().preset_bundle->printers.get_selected_preset_name(), - "curr_bed_type"); - if (!str_bed_type.empty()) { - int bed_type_value = atoi(str_bed_type.c_str()); - if (bed_type_value <= 0 || bed_type_value >= btCount) { - bed_type_value = preset_bundle.printers.get_edited_preset().get_default_bed_type(&preset_bundle); - } + bool flag = m_begin_sync_printer_status && !has_changed; + if (!(flag)) { + auto str_bed_type = wxGetApp().app_config->get_printer_setting(wxGetApp().preset_bundle->printers.get_selected_preset_name(), + "curr_bed_type"); + if (!str_bed_type.empty()) { + int bed_type_value = atoi(str_bed_type.c_str()); + if (bed_type_value <= 0 || bed_type_value >= btCount) { + bed_type_value = preset_bundle.printers.get_edited_preset().get_default_bed_type(&preset_bundle); + } - p->combo_printer_bed->SelectAndNotify(bed_type_value - 1); + p->combo_printer_bed->SelectAndNotify(bed_type_value - 1); + } else { + BedType bed_type = preset_bundle.printers.get_edited_preset().get_default_bed_type(&preset_bundle); + p->combo_printer_bed->SelectAndNotify((int) bed_type - 1); + } } else { - BedType bed_type = preset_bundle.printers.get_edited_preset().get_default_bed_type(&preset_bundle); - p->combo_printer_bed->SelectAndNotify((int) bed_type - 1); + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ":no need reset_bed_type_combox_choices"; } } } else {