thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit slightly modified version of patch #3018727: fix subtitle options (thanks fuzzie).

Browse source 
svn-id: r50080
This commit is contained in:
Thierry Crozat 2010-06-20 14:46:00 +00:00
parent 15ae4d8f59
commit f58c69e65d
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gui/options.cpp
View file

@ -269,8 +269,8 @@ void OptionsDialog::open() {
int speed; int speed;
int sliderMaxValue = _subSpeedSlider->getMaxValue(); int sliderMaxValue = _subSpeedSlider->getMaxValue();
_subMode = getSubtitleMode(ConfMan.getBool("subtitles", _domain), ConfMan.getBool("speech_mute", _domain)); int subMode = getSubtitleMode(ConfMan.getBool("subtitles", _domain), ConfMan.getBool("speech_mute", _domain));
_subToggleGroup->setValue(_subMode); _subToggleGroup->setValue(subMode);
// Engines that reuse the subtitle speed widget set their own max value. // Engines that reuse the subtitle speed widget set their own max value.
// Scale the config value accordingly (see addSubtitleControls) // Scale the config value accordingly (see addSubtitleControls)
@ -401,7 +401,7 @@ void OptionsDialog::close() {
int talkspeed; int talkspeed;
int sliderMaxValue = _subSpeedSlider->getMaxValue(); int sliderMaxValue = _subSpeedSlider->getMaxValue();
switch (_subMode) { switch (_subToggleGroup->getValue()) {
case kSubtitlesSpeech: case kSubtitlesSpeech:
subtitles = speech_mute = false; subtitles = speech_mute = false;
break; break;

1
gui/options.h
View file

@ -125,7 +125,6 @@ private:
RadiobuttonWidget *_subToggleSubOnly; RadiobuttonWidget *_subToggleSubOnly;
RadiobuttonWidget *_subToggleSpeechOnly; RadiobuttonWidget *_subToggleSpeechOnly;
RadiobuttonWidget *_subToggleSubBoth; RadiobuttonWidget *_subToggleSubBoth;
int _subMode;
static const char *_subModeDesc[]; static const char *_subModeDesc[];
static const char *_lowresSubModeDesc[]; static const char *_lowresSubModeDesc[];
StaticTextWidget *_subSpeedDesc; StaticTextWidget *_subSpeedDesc;