diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index ed10ec25b..e044cc60c 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -192,15 +192,6 @@ void TipsDialog::on_dpi_changed(const wxRect &suggested_rect) Refresh(); } -void TipsDialog::on_ok(wxMouseEvent &event) -{ - if (m_show_again) { - if (!m_app_key.empty()) - wxGetApp().app_config->set_bool(m_app_key, m_show_again); - } - EndModal(wxID_OK); -} - void ParamsPanel::Highlighter::set_timer_owner(wxEvtHandler *owner, int timerid /* = wxID_ANY*/) { m_timer.SetOwner(owner, timerid); diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp index 24ee66f71..4e286c270 100644 --- a/src/slic3r/GUI/ParamsPanel.hpp +++ b/src/slic3r/GUI/ParamsPanel.hpp @@ -56,7 +56,6 @@ public: protected: void on_dpi_changed(const wxRect &suggested_rect) override; - void on_ok(wxMouseEvent &event); wxBoxSizer *create_item_checkbox(wxString title, wxWindow *parent, wxString tooltip, std::string param); Button* add_button(wxWindowID btn_id, const wxString &label, bool set_focus = false); }; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a6c16b620..5b87cdb7e 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -10892,7 +10892,6 @@ bool Plater::try_sync_preset_with_connected_printer(int& nozzle_diameter) sync_printer_preset = true; } else { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " sync_after_load_file_show_flag"; - return false; } } } @@ -10901,13 +10900,14 @@ bool Plater::try_sync_preset_with_connected_printer(int& nozzle_diameter) if (sync_printer_preset && printer_preset.get_current_printer_type(preset_bundle) == printer_type && is_approx((float) (preset_nozzle_diameter), machine_nozzle_diameter)) sync_printer_preset = false; } - - update_objects_position_when_select_preset([&obj, machine_preset, &sync_printer_preset]() { + if (!sync_printer_preset) + return false; + //do sync_printer_preset + update_objects_position_when_select_preset([&obj, machine_preset]() { machine_preset->is_visible = true; - if (sync_printer_preset) { - Tab* printer_tab = GUI::wxGetApp().get_tab(Preset::Type::TYPE_PRINTER); - printer_tab->select_preset(machine_preset->name); - } + Tab* printer_tab = GUI::wxGetApp().get_tab(Preset::Type::TYPE_PRINTER); + printer_tab->select_preset(machine_preset->name); + if (obj->is_multi_extruders()) GUI::wxGetApp().sidebar().sync_extruder_list(); });