mirror of
https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git
synced 2025-09-28 18:43:15 +08:00
FIX:update_all_preset_comboboxes shoulld not return
jira: STUDIO-12045 Change-Id: Ie507a87f9be6b95350603231a4ef7ee5596f5fdf
This commit is contained in:
parent
16a066b2b9
commit
1541e256f9
@ -2159,33 +2159,34 @@ void Sidebar::update_all_preset_comboboxes()
|
|||||||
if (config) {
|
if (config) {
|
||||||
m_update_3d_state = true;
|
m_update_3d_state = true;
|
||||||
bool has_changed = reset_bed_type_combox_choices();
|
bool has_changed = reset_bed_type_combox_choices();
|
||||||
if (m_begin_sync_printer_status && !has_changed) {
|
bool flag = m_begin_sync_printer_status && !has_changed;
|
||||||
return;
|
if (!(flag)) {
|
||||||
}
|
if (m_soft_first_start && !wxGetApp().get_app_conf_exists()) {
|
||||||
if (m_soft_first_start && !wxGetApp().get_app_conf_exists()) {
|
use_default_bed_type();
|
||||||
use_default_bed_type();
|
} else {
|
||||||
} else {
|
auto user_bed_type_flag = config->get("user_bed_type") == "true";
|
||||||
auto user_bed_type_flag = config->get("user_bed_type") == "true";
|
if (!user_bed_type_flag) { // bed_type not follow machine
|
||||||
if (!user_bed_type_flag) { //bed_type not follow machine
|
|
||||||
set_bed_by_curr_bed_type(config);
|
|
||||||
} else {//bed_type follow machine
|
|
||||||
if (m_is_gcode_file) {//.gcode.3mf case
|
|
||||||
m_is_gcode_file = false;
|
|
||||||
set_bed_by_curr_bed_type(config);
|
set_bed_by_curr_bed_type(config);
|
||||||
}
|
} else { // bed_type follow machine
|
||||||
else if (user_bed_type_flag) {
|
if (m_is_gcode_file) { //.gcode.3mf case
|
||||||
if (config->has_section("user_bed_type_list")) {
|
m_is_gcode_file = false;
|
||||||
auto user_bed_type_list = config->get_section("user_bed_type_list");
|
set_bed_by_curr_bed_type(config);
|
||||||
if (user_bed_type_list.size() > 0 && user_bed_type_list[cur_preset_name].size() > 0) {
|
} else if (user_bed_type_flag) {
|
||||||
set_bed_type(user_bed_type_list[cur_preset_name]);
|
if (config->has_section("user_bed_type_list")) {
|
||||||
|
auto user_bed_type_list = config->get_section("user_bed_type_list");
|
||||||
|
if (user_bed_type_list.size() > 0 && user_bed_type_list[cur_preset_name].size() > 0) {
|
||||||
|
set_bed_type(user_bed_type_list[cur_preset_name]);
|
||||||
|
} else {
|
||||||
|
use_default_bed_type();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
use_default_bed_type();
|
use_default_bed_type();
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
use_default_bed_type();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ":no need reset_bed_type_combox_choices";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ":error:AppConfig is nullptr";
|
BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ":error:AppConfig is nullptr";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user