diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-27 18:05:16 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-27 18:05:16 +0000 |
commit | 3075e3bafd63480c5ca1476c1150e5da7c77a756 (patch) | |
tree | e3fc3205fc2979081619f7d178db8d591f72632a /rbutil/rbutilqt | |
parent | 0f3987ce7f2434c8a85242f388d8bd98c92866b1 (diff) | |
download | rockbox-3075e3bafd63480c5ca1476c1150e5da7c77a756.tar.gz rockbox-3075e3bafd63480c5ca1476c1150e5da7c77a756.zip |
Cache was intended to be disabled per default. Also make the "disable download cache" button in installation window working.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14480 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 7a182965bc..e6b97b214d 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp @@ -176,7 +176,7 @@ void Config::setUserSettings(QSettings *user) if(!QFileInfo(userSettings->value("defaults/cachepath").toString()).isDir()) userSettings->setValue("defaults/cachepath", QDir::tempPath()); ui.cachePath->setText(userSettings->value("defaults/cachepath").toString()); - ui.cacheDisable->setChecked(userSettings->value("defaults/cachedisable").toBool()); + ui.cacheDisable->setChecked(userSettings->value("defaults/cachedisable", true).toBool()); ui.cacheOfflineMode->setChecked(userSettings->value("defaults/offline").toBool()); QList<QFileInfo> fs = QDir(userSettings->value("defaults/cachepath").toString() + "/rbutil-cache/").entryInfoList(QDir::Files | QDir::NoDotAndDotDot); qint64 sz = 0; diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index b1b8d638fa..db9af725d7 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -99,8 +99,12 @@ void Install::accept() installer->setUrl(file); installer->setProxy(proxy); installer->setLogSection("rockboxbase"); - if(!userSettings->value("defaults/cachedisable").toBool()) - installer->setCache(userSettings->value("defaults/cachepath", QDir::tempPath()).toString()); + if(!userSettings->value("defaults/cachedisable").toBool() + && !ui.radioCurrent->isChecked() + && !ui.checkBoxCache->isChecked()) + installer->setCache(userSettings->value("defaults/cachepath", + QDir::tempPath()).toString()); + installer->setLogVersion(myversion); installer->setMountPoint(mountPoint); installer->install(logger); |