aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-07-16 22:09:05 -0700
committerFilippos Karapetis2019-09-01 22:47:55 +0300
commit318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12 (patch)
treed38d0048557b0fbc0a5ea09fcaf36abf3890cfdd /gui
parentd2d34a4ecaabd7d436bfab942c9003d0e478ad2a (diff)
downloadscummvm-rg350-318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12.tar.gz
scummvm-rg350-318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12.tar.bz2
scummvm-rg350-318c6d7ec6e5562d0fd3e9d70386d0fcde86cf12.zip
TTS: Finish implementing the Windows TTS manager
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp1
-rw-r--r--gui/widgets/popup.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 71f8cadd15..b82bfc6440 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2161,6 +2161,7 @@ void GlobalOptionsDialog::apply() {
guiLang.setChar('\0', 2);
ttsMan->setLanguage(guiLang);
}
+ _ttsVoiceSelectionPopUp->setSelectedTag(0);
}
int volume = (ConfMan.getInt("speech_volume", "scummvm") * 100) / 256;
if (ConfMan.hasKey("mute", "scummvm") && ConfMan.getBool("mute", "scummvm"))
diff --git a/gui/widgets/popup.h b/gui/widgets/popup.h
index a898479410..3ccf8787d5 100644
--- a/gui/widgets/popup.h
+++ b/gui/widgets/popup.h
@@ -77,7 +77,7 @@ public:
uint32 getSelectedTag() const { return (_selectedItem >= 0) ? _entries[_selectedItem].tag : (uint32)-1; }
// const String& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : String::emptyString; }
- void handleMouseEntered(int button) { read(_entries[_selectedItem].name); setFlags(WIDGET_HILITED); markAsDirty(); }
+ void handleMouseEntered(int button) { if (_selectedItem != -1) read(_entries[_selectedItem].name); setFlags(WIDGET_HILITED); markAsDirty(); }
void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED); markAsDirty(); }
virtual void reflowLayout();