X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=81a445efbce029fa7bf51842bf0ac9eba3d4c8f5;hb=fe851f2e6e57d3a8781ecc173089c19632c521e3;hp=f84c9d67f82b7902df5389eb8edc89e4f74c51be;hpb=b39dbb7cf1b0352cf0eb3af4bf4929556355bff5;p=dcpomatic.git diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index f84c9d67f..81a445efb 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -195,14 +195,6 @@ AudioPanel::add_to_grid () } -AudioPanel::~AudioPanel () -{ - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = nullptr; - } -} - void AudioPanel::film_changed (Film::Property property) { @@ -424,17 +416,14 @@ AudioPanel::setup_sensitivity () void AudioPanel::show_clicked () { - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = nullptr; - } + _audio_dialog.reset(); auto ac = _parent->selected_audio (); if (ac.size() != 1) { return; } - _audio_dialog = new AudioDialog (this, _parent->film(), _parent->film_viewer(), ac.front()); + _audio_dialog.reset(this, _parent->film(), _parent->film_viewer(), ac.front()); _audio_dialog->Show (); } @@ -533,10 +522,7 @@ void AudioPanel::set_film (shared_ptr) { /* We are changing film, so destroy any audio dialog for the old one */ - if (_audio_dialog) { - _audio_dialog->Destroy (); - _audio_dialog = nullptr; - } + _audio_dialog.reset(); }