Skip to content

Commit 763d97f

Browse files
committed
Properly deal with empty cache/directory in WFS provider, server and globe plugin
Fixes #15111
1 parent eba8c5d commit 763d97f

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/plugins/globe/globe_plugin.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,9 @@ void GlobePlugin::run()
342342
}
343343
else
344344
{
345-
QString cacheDirectory = settings.value( "cache/directory", QgsApplication::qgisSettingsDirPath() + "cache" ).toString();
345+
QString cacheDirectory = settings.value( "cache/directory" ).toString();
346+
if ( cacheDirectory.isEmpty() )
347+
cacheDirectory = QgsApplication::qgisSettingsDirPath() + "cache";
346348
osgEarth::Drivers::FileSystemCacheOptions cacheOptions;
347349
cacheOptions.rootPath() = cacheDirectory.toStdString();
348350

src/providers/wfs/qgswfsutils.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ int QgsWFSUtils::gmCounter = 0;
3737
QString QgsWFSUtils::getBaseCacheDirectory( bool createIfNotExisting )
3838
{
3939
QSettings settings;
40-
QString cacheDirectory = settings.value( "cache/directory", QgsApplication::qgisSettingsDirPath() + "cache" ).toString();
40+
QString cacheDirectory = settings.value( "cache/directory" ).toString();
41+
if ( cacheDirectory.isEmpty() )
42+
cacheDirectory = QgsApplication::qgisSettingsDirPath() + "cache";
4143
if ( createIfNotExisting )
4244
{
4345
QMutexLocker locker( &gmMutex );

src/server/qgsserver.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ void QgsServer::setupNetworkAccessManager()
115115
QSettings settings;
116116
QgsNetworkAccessManager *nam = QgsNetworkAccessManager::instance();
117117
QNetworkDiskCache *cache = new QNetworkDiskCache( nullptr );
118-
QString cacheDirectory = settings.value( "cache/directory", QgsApplication::qgisSettingsDirPath() + "cache" ).toString();
118+
QString cacheDirectory = settings.value( "cache/directory" ).toString();
119+
if ( cacheDirectory.isEmpty() )
120+
cacheDirectory = QgsApplication::qgisSettingsDirPath() + "cache";
119121
qint64 cacheSize = settings.value( "cache/size", 50 * 1024 * 1024 ).toULongLong();
120122
QgsMessageLog::logMessage( QString( "setCacheDirectory: %1" ).arg( cacheDirectory ), "Server", QgsMessageLog::INFO );
121123
QgsMessageLog::logMessage( QString( "setMaximumCacheSize: %1" ).arg( cacheSize ), "Server", QgsMessageLog::INFO );

0 commit comments

Comments
 (0)