From 912ee2edc35d3a10f5d2d95e8caaae70050de834 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Jun 2018 13:10:19 +0100 Subject: Fix incorrect handling of force-effect in subtitle appearance. --- src/wx/subtitle_appearance_dialog.cc | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index 8ae99bc73..8ae479746 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -210,16 +210,20 @@ SubtitleAppearanceDialog::apply () } else { _content->subtitle->unset_colour (); } - switch (_effect->GetSelection()) { - case NONE: - _content->subtitle->set_effect (dcp::NONE); - break; - case OUTLINE: - _content->subtitle->set_effect (dcp::BORDER); - break; - case SHADOW: - _content->subtitle->set_effect (dcp::SHADOW); - break; + if (_force_effect->GetValue()) { + switch (_effect->GetSelection()) { + case NONE: + _content->subtitle->set_effect (dcp::NONE); + break; + case OUTLINE: + _content->subtitle->set_effect (dcp::BORDER); + break; + case SHADOW: + _content->subtitle->set_effect (dcp::SHADOW); + break; + } + } else { + _content->subtitle->unset_effect (); } if (_force_effect_colour->GetValue ()) { wxColour const ec = _effect_colour->GetColour (); -- cgit v1.2.3