summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-04-06 15:55:48 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-04-06 16:18:46 +0200
commitfe756b65deed38a82de2d6097a2bd4798f7cd0eb (patch)
tree1b6a1ad456160c902785b171cb94c75832763cde /rbutil/rbutilqt
parent76c74c4437c88a33da998c9ad0103db4d0e39069 (diff)
downloadrockbox-fe756b65deed38a82de2d6097a2bd4798f7cd0eb.tar.gz
rockbox-fe756b65deed38a82de2d6097a2bd4798f7cd0eb.zip
Drop empty voice strings when building list of strings.
Instead of skipping empty voice strings when trying to voice the list of strings drop them immediately when building the list of strings. Change-Id: Ib2627fb4b5061916cf04d67b6b78f457122ed2cd
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/voicefile.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp
index 2cc9f18c25..d5a3586e1b 100644
--- a/rbutil/rbutilqt/base/voicefile.cpp
+++ b/rbutil/rbutilqt/base/voicefile.cpp
@@ -160,8 +160,14 @@ void VoiceFileCreator::downloadDone(bool error)
QFile::copy(":/builtin/VOICE_PAUSE.wav",m_path + "/VOICE_PAUSE.wav");
entry.wavfilename = m_path + "/VOICE_PAUSE.wav";
entry.voiced = true;
+ m_talkList.append(entry);
+ }
+ else if(entry.toSpeak.isEmpty()) {
+ qDebug() << "[Voicefile] Empty voice string for ID" << id;
+ }
+ else {
+ m_talkList.append(entry);
}
- m_talkList.append(entry);
idfound=false;
voicefound=false;
}