From b30181a14bd18743af122442f50a031bdec2b829 Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Wed, 13 Feb 2008 18:25:01 +0000 Subject: [PATCH] rbutil: fix bug with wrong downloadURL for h10. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16306 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/install.cpp | 2 +- rbutil/rbutilqt/rbsettings.cpp | 9 +++++++++ rbutil/rbutilqt/rbsettings.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index b64e1637d6..1d265404ea 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -58,7 +58,7 @@ void Install::accept() } QString myversion; - QString buildname = settings->curPlatform(); + QString buildname = settings->curPlatformName(); if(ui.radioStable->isChecked()) { file = QString("%1/rockbox-%2-%3.zip") .arg(settings->downloadUrl(), diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 2aa43f7f84..8b2569c365 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp @@ -190,6 +190,15 @@ QString RbSettings::curPlatform() return userSettings->value("platform").toString(); } +QString RbSettings::curPlatformName() +{ + QString platform = userSettings->value("platform").toString(); + devices->beginGroup(platform); + QString name = devices->value("platform").toString(); + devices->endGroup(); + return name; +} + QString RbSettings::curManual() { QString platform = userSettings->value("platform").toString(); diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index 0613bea022..3218f30b0e 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h @@ -86,6 +86,7 @@ class RbSettings : public QObject QString curBrand(); QString curName(); QString curPlatform(); + QString curPlatformName(); QString curManual(); bool curReleased(); QString curBootloaderMethod();