Fix crash due to the wrong window get returned in PointCtrl (SoftFe…

…ver#6261). `getWindow()` must return the control itself, not its child control; otherwise the child control will be destroyed twice when the tab container is destroyed.
Noisyfox · Aug 12, 2024 · 41fca66 · 41fca66
1 parent 7082e94
commit 41fca66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
@@ -2053,6 +2053,8 @@ boost::any& PointCtrl::get_value()
 	return m_value = Vec2d(x, y);
 }
 
+wxWindow* PointCtrl::getWindow() { return dynamic_cast<wxWindow*>(x_input); }
+
 void StaticText::BUILD()
 {
 	auto size = wxSize(wxDefaultSize);

diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
@@ -524,7 +524,7 @@ class PointCtrl : public Field {
 		x_textctrl->Disable();
 		y_textctrl->Disable(); }
 	wxSizer*		getSizer() override { return sizer; }
-	wxWindow*		getWindow() override { return dynamic_cast<wxWindow*>(x_textctrl); }
+	wxWindow*		getWindow() override;
 };
 
 class StaticText : public Field {