len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-14 15:42:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redo my previous segfault fix in a better way.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16205 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2008-02-03 11:49:29 +00:00
parent 5a38f3e9de
commit c5b8a7b45d
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rbutil/rbutilqt/createvoicewindow.cpp
View file

@ -45,7 +45,7 @@ void CreateVoiceWindow::accept()
logger->show(); logger->show();
connect(logger,SIGNAL(closed()),this,SLOT(close())); connect(logger,SIGNAL(closed()),this,SLOT(close()));
QString lang = ui.comboLanguage->currentText(); QString lang = ui.comboLanguage->currentText();
int wvThreshold = ui.wavtrimthreshold->value(); int wvThreshold = ui.wavtrimthreshold->value();
//safe selected language //safe selected language
@ -88,10 +88,8 @@ void CreateVoiceWindow::setSettings(RbSettings* sett)
QString encoder = settings->curEncoder(); QString encoder = settings->curEncoder();
// only proceed if encoder setting is set // only proceed if encoder setting is set
if(!encoder.isEmpty()) { EncBase* enc = getEncoder(encoder);
// FIXME: getEncoder CAN return a NULL pointer. Additional error if(enc != NULL) {
// checking is required or getEncoder should use the default engine
EncBase* enc = getEncoder(encoder);
enc->setCfg(settings); enc->setCfg(settings);
if(enc->configOk()) if(enc->configOk())
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder)); ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder));

7
rbutil/rbutilqt/installtalkwindow.cpp
View file

@ -119,11 +119,8 @@ void InstallTalkWindow::setSettings(RbSettings* sett)
ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!")); ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!"));
QString encoder = settings->curEncoder(); QString encoder = settings->curEncoder();
// only proceed if encoder setting is set EncBase* enc = getEncoder(encoder);
if(!encoder.isEmpty()) { if(enc != NULL) {
// FIXME: getEncoder CAN return a NULL pointer. Additional error
// checking is required or getEncoder should use the default engine
EncBase* enc = getEncoder(encoder);
enc->setCfg(settings); enc->setCfg(settings);
if(enc->configOk()) if(enc->configOk())
ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder)); ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(encoder));