From f58c69e65d8dfa7ca924885d86043b84b18a522b Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 20 Jun 2010 14:46:00 +0000
Subject: Commit slightly modified version of patch #3018727: fix subtitle
 options (thanks fuzzie).

svn-id: r50080
---
 gui/options.cpp | 6 +++---
 gui/options.h   | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gui/options.cpp b/gui/options.cpp
index 780670e78b..7a69c6a25f 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -269,8 +269,8 @@ void OptionsDialog::open() {
 		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 @@ void OptionsDialog::close() {
 				int talkspeed;
 				int sliderMaxValue = _subSpeedSlider->getMaxValue();
 
-				switch (_subMode) {
+				switch (_subToggleGroup->getValue()) {
 				case kSubtitlesSpeech:
 					subtitles = speech_mute = false;
 					break;
diff --git a/gui/options.h b/gui/options.h
index fab25ebaed..cc62a309b4 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -125,7 +125,6 @@ private:
 	RadiobuttonWidget *_subToggleSubOnly;
 	RadiobuttonWidget *_subToggleSpeechOnly;
 	RadiobuttonWidget *_subToggleSubBoth;
-	int _subMode;
 	static const char *_subModeDesc[];
 	static const char *_lowresSubModeDesc[];
 	StaticTextWidget *_subSpeedDesc;
-- 
cgit v1.2.3