[Scummvm-cvs-logs] SF.net SVN: scummvm:[50080] scummvm/trunk/gui
criezy at users.sourceforge.net
criezy at users.sourceforge.net
Sun Jun 20 16:46:00 CEST 2010
Revision: 50080
http://scummvm.svn.sourceforge.net/scummvm/?rev=50080&view=rev
Author: criezy
Date: 2010-06-20 14:46:00 +0000 (Sun, 20 Jun 2010)
Log Message:
-----------
Commit slightly modified version of patch #3018727: fix subtitle options (thanks fuzzie).
Modified Paths:
--------------
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/options.h
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-06-20 13:38:24 UTC (rev 50079)
+++ scummvm/trunk/gui/options.cpp 2010-06-20 14:46:00 UTC (rev 50080)
@@ -269,8 +269,8 @@
int speed;
int sliderMaxValue = _subSpeedSlider->getMaxValue();
- _subMode = getSubtitleMode(ConfMan.getBool("subtitles", _domain), ConfMan.getBool("speech_mute", _domain));
- _subToggleGroup->setValue(_subMode);
+ int subMode = getSubtitleMode(ConfMan.getBool("subtitles", _domain), ConfMan.getBool("speech_mute", _domain));
+ _subToggleGroup->setValue(subMode);
// Engines that reuse the subtitle speed widget set their own max value.
// Scale the config value accordingly (see addSubtitleControls)
@@ -401,7 +401,7 @@
int talkspeed;
int sliderMaxValue = _subSpeedSlider->getMaxValue();
- switch (_subMode) {
+ switch (_subToggleGroup->getValue()) {
case kSubtitlesSpeech:
subtitles = speech_mute = false;
break;
Modified: scummvm/trunk/gui/options.h
===================================================================
--- scummvm/trunk/gui/options.h 2010-06-20 13:38:24 UTC (rev 50079)
+++ scummvm/trunk/gui/options.h 2010-06-20 14:46:00 UTC (rev 50080)
@@ -125,7 +125,6 @@
RadiobuttonWidget *_subToggleSubOnly;
RadiobuttonWidget *_subToggleSpeechOnly;
RadiobuttonWidget *_subToggleSubBoth;
- int _subMode;
static const char *_subModeDesc[];
static const char *_lowresSubModeDesc[];
StaticTextWidget *_subSpeedDesc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list