From 9f150f04c8fce17dbcbe11278dd78c6e35809aa2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 Feb 2025 01:53:48 +0100 Subject: Fix misunderstanding of wxDialog lifetime handling. Broken by d0308d53dd9f4d036d8c5fe8023920fcdfd43f39 wxDialog can be stack allocated if opened with ShowModal(), but not with Show(). Go back to wx_ptr for those that are opened with Show(). --- src/wx/content_panel.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/wx/content_panel.h') diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 18d740828..f99d518a2 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -20,7 +20,6 @@ #include "content_menu.h" -#include "content_timeline_dialog.h" #include "lib/enum_indexed_vector.h" #include "lib/film_property.h" #include "lib/text_type.h" @@ -134,7 +133,7 @@ private: EnumIndexedVector _text_panel; TimingPanel* _timing_panel; ContentMenu* _menu; - boost::optional _timeline_dialog; + wx_ptr _timeline_dialog; wxNotebook* _parent; wxWindow* _last_selected_tab = nullptr; -- cgit v1.2.3