From 5274dfd86aaaf1312485aff46cb2eb9caae9b8ea Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 22 Mar 2009 08:33:49 +0000 Subject: Properly reset theme file group if a checked group turned out to not include any theme information and gets skipped. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20446 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/installthemes.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'rbutil/rbutilqt') diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp index 6e15ae0b51..7dd765627b 100644 --- a/rbutil/rbutilqt/installthemes.cpp +++ b/rbutil/rbutilqt/installthemes.cpp @@ -89,13 +89,13 @@ void ThemesInstallWindow::downloadDone(bool error) QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); QStringList tl = iniDetails.childGroups(); - qDebug() << tl.size(); qDebug() << iniDetails.value("error/code").toString() << iniDetails.value("error/description").toString() << iniDetails.value("error/query").toString(); if(error) { - logger->addItem(tr("Network error: %1.\nPlease check your network and proxy settings.") + logger->addItem(tr("Network error: %1.\n" + "Please check your network and proxy settings.") .arg(getter->errorString()), LOGERROR); getter->abort(); logger->abort(); @@ -120,7 +120,11 @@ void ThemesInstallWindow::downloadDone(bool error) for(int i = 0; i < tl.size(); i++) { iniDetails.beginGroup(tl.at(i)); // skip all themes without name field set (i.e. error section) - if(iniDetails.value("name").toString().isEmpty()) continue; + if(iniDetails.value("name").toString().isEmpty()) { + iniDetails.endGroup(); + continue; + } + qDebug() << "adding theme:" << tl.at(i); QListWidgetItem *w = new QListWidgetItem; w->setData(Qt::DisplayRole, iniDetails.value("name").toString()); w->setData(Qt::UserRole, tl.at(i)); -- cgit v1.2.3