Add Cancel button to custom colour conversion dialogue (#880).

1 files changed, 7 insertions, 3 deletions

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 0a8feadc8..8a8dbd181 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -414,9 +414,13 @@ VideoPanel::edit_colour_conversion_clicked ()
 	}
 
 	ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ());
-	d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion));
-	d->ShowModal ();
-	vc.front()->video->set_colour_conversion (d->get ());
+	d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion));
+	if (d->ShowModal() == wxID_OK) {
+		vc.front()->video->set_colour_conversion (d->get ());
+	} else {
+		/* Reset the colour conversion choice */
+		film_content_changed (VideoContentProperty::COLOUR_CONVERSION);
+	}
 	d->Destroy ();
 }