From 50e8bb071ffae84915606b385ef75fe6735407e7 Mon Sep 17 00:00:00 2001 From: nowrep Date: Thu, 13 Mar 2014 12:53:19 +0100 Subject: [PATCH] [NetworkCache] Fix path for network cache --- src/lib/app/mainapplication.cpp | 2 +- src/lib/preferences/preferences.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index ce7112b58..0033309a0 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -470,7 +470,7 @@ QNetworkDiskCache* MainApplication::networkCache() { if (!m_networkCache) { Settings settings; - const QString defaultBasePath = QString("%1networkcache/").arg(DataPaths::currentProfilePath()); + const QString defaultBasePath = QString("%1/networkcache/").arg(DataPaths::currentProfilePath()); const QString basePath = settings.value("Web-Browser-Settings/CachePath", defaultBasePath).toString(); const QString cachePath = QString("%1/%2-Qt%3/").arg(basePath, qWebKitVersion(), qVersion()); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index c15ae253e..19dad12f5 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -57,6 +57,7 @@ #include #include #include +#include static QString createLanguageItem(const QString &lang) { @@ -301,8 +302,7 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent) ui->allowCache->setChecked(settings.value("AllowLocalCache", true).toBool()); ui->cacheMB->setValue(settings.value("LocalCacheSize", 50).toInt()); ui->MBlabel->setText(settings.value("LocalCacheSize", 50).toString() + " MB"); - // FIXME: !!! - ui->cachePath->setText(settings.value("CachePath", QString("%1networkcache/").arg(DataPaths::currentProfilePath())).toString()); + ui->cachePath->setText(settings.value("CachePath", mApp->networkCache()->cacheDirectory()).toString()); connect(ui->allowCache, SIGNAL(clicked(bool)), this, SLOT(allowCacheChanged(bool))); connect(ui->cacheMB, SIGNAL(valueChanged(int)), this, SLOT(cacheValueChanged(int))); connect(ui->changeCachePath, SIGNAL(clicked()), this, SLOT(changeCachePathClicked()));