diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 67bd1c4559..7c7838afa1 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -862,11 +862,11 @@ void Choice::BUILD() { #endif temp->Bind(wxEVT_COMBOBOX_DROPDOWN, [this](wxCommandEvent&) { m_is_dropped = true; }); - temp->Bind(wxEVT_COMBOBOX_CLOSEUP, [this](wxCommandEvent& evt) { + temp->Bind(wxEVT_COMBOBOX_CLOSEUP, [this, temp](wxCommandEvent&) { // EVT_COMBOBOX_CLOSEUP is called after EVT_COMBOBOX on Windows // so, always set m_suppress_change to "true" #ifndef __WXMSW__ - if (m_last_selected == evt.GetSelection()) + if (m_last_selected == temp->GetSelection()) #endif //__WXMSW__ m_is_dropped = false; }); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index c60c84bad3..1fbded3778 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -103,12 +103,12 @@ PresetComboBox::PresetComboBox(wxWindow* parent, Preset::Type preset_type, const // parameters for an icon's drawing fill_width_height(); - Bind(wxEVT_COMBOBOX_DROPDOWN, [this](wxCommandEvent& evt) { m_suppress_change = false; }); - Bind(wxEVT_COMBOBOX_CLOSEUP, [this](wxCommandEvent& evt) { + Bind(wxEVT_COMBOBOX_DROPDOWN, [this](wxCommandEvent&) { m_suppress_change = false; }); + Bind(wxEVT_COMBOBOX_CLOSEUP, [this](wxCommandEvent&) { // EVT_COMBOBOX_CLOSEUP is called after EVT_COMBOBOX on Windows // so, always set m_suppress_change to "true" #ifndef __WXMSW__ - if (m_last_selected == evt.GetSelection()) + if (m_last_selected == this->GetSelection()) #endif //__WXMSW__ m_suppress_change = true; });