amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX:add protection logic

Browse source 
Change-Id: Ida015d88268d48fd21dc41da37e24e17ed3cfe7d
This commit is contained in:
tao wang 2023-06-25 14:51:14 +08:00 committed by Lane.Wei
parent 9938952cfd
commit 266f456197
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/SelectMachine.cpp
View file

@ -2938,7 +2938,9 @@ void SelectMachineDialog::on_selection_changed(wxCommandEvent &event)
if (obj && !obj->get_lan_mode_connection_state()) { if (obj && !obj->get_lan_mode_connection_state()) {
obj->command_get_version(); obj->command_get_version();
obj->command_request_push_all(); obj->command_request_push_all();
if (dev->get_selected_machine()->dev_id != m_printer_last_select) { if (!dev->get_selected_machine()) {
dev->set_selected_machine(m_printer_last_select, true);
}else if (dev->get_selected_machine()->dev_id != m_printer_last_select) {
dev->set_selected_machine(m_printer_last_select, true); dev->set_selected_machine(m_printer_last_select, true);
} }
// Has changed machine unrecoverably // Has changed machine unrecoverably

12
src/slic3r/GUI/SendToPrinter.cpp
View file

@ -978,10 +978,16 @@ void SendToPrinterDialog::on_selection_changed(wxCommandEvent &event)
} }
} }
if (obj) { if (obj && !obj->get_lan_mode_connection_state()) {
obj->command_get_version(); obj->command_get_version();
dev->set_selected_machine(m_printer_last_select); obj->command_request_push_all();
} else { if (!dev->get_selected_machine()) {
dev->set_selected_machine(m_printer_last_select, true);
}else if (dev->get_selected_machine()->dev_id != m_printer_last_select) {
dev->set_selected_machine(m_printer_last_select, true);
}
}
else {
BOOST_LOG_TRIVIAL(error) << "on_selection_changed dev_id not found"; BOOST_LOG_TRIVIAL(error) << "on_selection_changed dev_id not found";
return; return;
} }