summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-06-08 13:10:19 +0100
committerCarl Hetherington <cth@carlh.net>2018-06-08 13:10:19 +0100
commit912ee2edc35d3a10f5d2d95e8caaae70050de834 (patch)
tree078f6e4f225c60a445ee7fe993c46ed430c5afb1 /src
parente35d2120a831fe6ccd993a4f86eac084e057e78d (diff)
Fix incorrect handling of force-effect in subtitle appearance.
Diffstat (limited to 'src')
-rw-r--r--src/wx/subtitle_appearance_dialog.cc24
1 files changed, 14 insertions, 10 deletions
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 ();