X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=4f7c2db791400d8038efed8ab81499e69d5b6061;hp=e1770efbe8e44fbfd0540a6ca1548f02e75e6f89;hb=7aab34abcab28ca38a5354dec075b56d430e82db;hpb=526829ad670c19d5466555890d8afe8d7f744834

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index e1770efbe..4f7c2db79 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -541,17 +541,16 @@ VideoPanel::edit_colour_conversion_clicked ()
 {
 	auto vc = _parent->selected_video ();
 
-	auto d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
-	d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion));
-	if (d->ShowModal() == wxID_OK) {
+	ContentColourConversionDialog dialog(this, vc.front()->video->yuv());
+	dialog.set(vc.front()->video->colour_conversion().get_value_or(PresetColourConversion::all().front().conversion));
+	if (dialog.ShowModal() == wxID_OK) {
 		for (auto i: vc) {
-			i->video->set_colour_conversion (d->get ());
+			i->video->set_colour_conversion(dialog.get());
 		}
 	} else {
 		/* Reset the colour conversion choice */
 		film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
 	}
-	d->Destroy ();
 }
 
 
@@ -725,16 +724,17 @@ bool
 VideoPanel::scale_custom_edit_clicked ()
 {
 	auto vc = _parent->selected_video().front()->video;
-	auto d = new CustomScaleDialog (this, vc->size(), _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size());
-	int const r = d->ShowModal ();
-	if (r == wxID_OK) {
-		for (auto i: _parent->selected_video()) {
-			i->video->set_custom_ratio (d->custom_ratio());
-			i->video->set_custom_size (d->custom_size());
-		}
+	CustomScaleDialog dialog(this, vc->size(), _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size());
+	if (dialog.ShowModal() != wxID_OK) {
+		return false;
+	}
+
+	for (auto i: _parent->selected_video()) {
+		i->video->set_custom_ratio(dialog.custom_ratio());
+		i->video->set_custom_size(dialog.custom_size());
 	}
-	d->Destroy ();
-	return r == wxID_OK;
+
+	return true;
 }