diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-04-22 15:38:41 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-04-22 15:38:41 +0000 |
commit | 4d25fb8fe1a3525f20cc1298e87a83ea6b68e003 (patch) | |
tree | 26c6d61e8b55c893ab1e79db5cf71625695c4d58 | |
parent | 88e68ec5b0315748936380df892472d6eb9dbf4c (diff) | |
download | rockbox-4d25fb8fe1a3525f20cc1298e87a83ea6b68e003.tar.gz rockbox-4d25fb8fe1a3525f20cc1298e87a83ea6b68e003.zip |
Fix "Test TTS" button not working.
Make sure the temporary file doesn't get destroyed before it has been played.
Fixes the "Test TTS" button not giving a test playback anymore for TTS systems
that cannot do the playback themselves.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29760 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 0ace229ee5..5c02cd8d7b 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -754,8 +754,9 @@ void Config::testTts() | |||
754 | } | 754 | } |
755 | 755 | ||
756 | QString filename; | 756 | QString filename; |
757 | QTemporaryFile file(this); | ||
758 | // keep filename empty if the TTS can do speaking for itself. | ||
757 | if(!(tts->capabilities() & TTSBase::CanSpeak)) { | 759 | if(!(tts->capabilities() & TTSBase::CanSpeak)) { |
758 | QTemporaryFile file(this); | ||
759 | file.open(); | 760 | file.open(); |
760 | filename = file.fileName(); | 761 | filename = file.fileName(); |
761 | file.close(); | 762 | file.close(); |
@@ -771,7 +772,7 @@ void Config::testTts() | |||
771 | return; | 772 | return; |
772 | } | 773 | } |
773 | tts->stop(); | 774 | tts->stop(); |
774 | if(!(tts->capabilities() & TTSBase::CanSpeak)) { | 775 | if(!filename.isEmpty()) { |
775 | #if defined(Q_OS_LINUX) | 776 | #if defined(Q_OS_LINUX) |
776 | QString exe = Utils::findExecutable("aplay"); | 777 | QString exe = Utils::findExecutable("aplay"); |
777 | if(exe == "") exe = Utils::findExecutable("play"); | 778 | if(exe == "") exe = Utils::findExecutable("play"); |