diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index ff2479987..35aae2b33 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2253,10 +2253,17 @@ bool GUI_App::OnInit() class wxBoostLog : public wxLog { - void DoLogText(const wxString &msg) { + void DoLogText(const wxString &msg) override { BOOST_LOG_TRIVIAL(warning) << msg.ToUTF8().data(); } + ~wxBoostLog() override + { + // This is a hack. Prevent thread logs from going to wxGuiLog on app quit. + auto t = wxLog::SetActiveTarget(this); + wxLog::FlushActive(); + wxLog::SetActiveTarget(t); + } }; bool GUI_App::on_init_inner() diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp index 4e77b6dc8..ba1a3117f 100644 --- a/src/slic3r/GUI/Widgets/DropDown.cpp +++ b/src/slic3r/GUI/Widgets/DropDown.cpp @@ -475,10 +475,9 @@ void DropDown::mouseWheelMoved(wxMouseEvent &event) // currently unused events void DropDown::sendDropDownEvent() { - selection = hover_item; wxCommandEvent event(wxEVT_COMBOBOX, GetId()); event.SetEventObject(this); - event.SetInt(selection); + event.SetInt(hover_item); event.SetString(GetValue()); GetEventHandler()->ProcessEvent(event); }