diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-30 19:20:10 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-30 19:20:10 +0000 |
commit | 771752010280ac3c10fcb46e14cb622249bc56d9 (patch) | |
tree | eef195da99b7a4d94b317a238450c8a81b5c9840 /rbutil | |
parent | fae8e3fe4f558f7e689731b0c49d3edb31b31e13 (diff) | |
download | rockbox-771752010280ac3c10fcb46e14cb622249bc56d9.tar.gz rockbox-771752010280ac3c10fcb46e14cb622249bc56d9.zip |
When installing builds use the real platform name, not the configuration section one. Fixes installation of X5V builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14540 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 76baac44e0..5edef5b6ee 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -58,33 +58,31 @@ void Install::accept() } QString myversion; + QString buildname; + devices->beginGroup(userSettings->value("defaults/platform").toString()); + buildname = devices->value("platform").toString(); + devices->endGroup(); if(ui.radioStable->isChecked()) { file = QString("%1/rockbox-%2-%3.zip") .arg(devices->value("download_url").toString(), - devices->value("last_release").toString(), - userSettings->value("defaults/platform").toString()); + devices->value("last_release").toString(), buildname); fileName = QString("rockbox-%1-%2.zip") - .arg(devices->value("last_release").toString(), - userSettings->value("defaults/platform").toString()); + .arg(devices->value("last_release").toString(), buildname); userSettings->setValue("defaults/build", "stable"); myversion = version.value("rel_rev"); } else if(ui.radioArchived->isChecked()) { file = QString("%1%2/rockbox-%3-%4.zip") .arg(devices->value("daily_url").toString(), - userSettings->value("defaults/platform").toString(), - userSettings->value("defaults/platform").toString(), - version.value("arch_date")); + buildname, buildname, version.value("arch_date")); fileName = QString("rockbox-%1-%2.zip") - .arg(userSettings->value("defaults/platform").toString(), - version.value("arch_date")); + .arg(buildname, version.value("arch_date")); userSettings->setValue("defaults/build", "archived"); myversion = "r" + version.value("arch_rev") + "-" + version.value("arch_date"); } else if(ui.radioCurrent->isChecked()) { file = QString("%1%2/rockbox.zip") - .arg(devices->value("bleeding_url").toString(), - userSettings->value("defaults/platform").toString()); + .arg(devices->value("bleeding_url").toString(), buildname); fileName = QString("rockbox.zip"); userSettings->setValue("defaults/build", "current"); myversion = "r" + version.value("bleed_rev"); |