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

[dcpomatic.git] / src / wx / video_panel.cc

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 0a8feadc82279f32d248a3b59202c0e4c6af32a6..8a8dbd181609e5c15734cc2fc4770bcdb5fd5c20 100644 (file)
--- 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 ();
 }