From 5c80b44b2889f0d260b3afc8f2a9aac57c433707 Mon Sep 17 00:00:00 2001 From: bluebrother Date: Mon, 27 Aug 2007 18:05:16 +0000 Subject: [PATCH] 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 --- rbutil/rbutilqt/configure.cpp | 2 +- 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 7a182965b..e6b97b214 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 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 b1b8d638f..db9af725d 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); -- 2.11.4.GIT