diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-02-25 01:53:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-02-25 13:04:08 +0100 |
| commit | 6d3086dd78a35bdc179a6579e23f8b5816347dbf (patch) | |
| tree | a47facfec259302afd6e0e690b748ad9f655548e /src/wx/dcp_panel.cc | |
| parent | 91c171b65e7329b90ac77442fd35b165bde70b26 (diff) | |
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().
Diffstat (limited to 'src/wx/dcp_panel.cc')
| -rw-r--r-- | src/wx/dcp_panel.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 3d28a3ae5..0f0edc971 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -339,7 +339,7 @@ DCPPanel::resolution_changed () void DCPPanel::markers_clicked () { - _markers_dialog.emplace(_panel, _film, _viewer); + _markers_dialog.reset(_panel, _film, _viewer); _markers_dialog->Show(); } @@ -348,11 +348,11 @@ void DCPPanel::metadata_clicked () { if (_film->interop()) { - _interop_metadata_dialog.emplace(_panel, _film); + _interop_metadata_dialog.reset(_panel, _film); _interop_metadata_dialog->setup (); _interop_metadata_dialog->Show (); } else { - _smpte_metadata_dialog.emplace(_panel, _film); + _smpte_metadata_dialog.reset(_panel, _film); _smpte_metadata_dialog->setup (); _smpte_metadata_dialog->Show (); } @@ -362,7 +362,7 @@ DCPPanel::metadata_clicked () void DCPPanel::reels_clicked() { - _dcp_timeline.emplace(_panel, _film); + _dcp_timeline.reset(_panel, _film); _dcp_timeline->Show(); } @@ -1029,7 +1029,7 @@ DCPPanel::show_audio_clicked () return; } - _audio_dialog.emplace(_panel, _film, _viewer); + _audio_dialog.reset(_panel, _film, _viewer); _audio_dialog->Show(); } |
