Skip to content
Permalink
Browse files

Merge pull request #38509 from qgis-bot/backport-38488-to-release-3_14

[Backport release-3_14] Server: Call QgsProject::setInstance on project passed as parameter
  • Loading branch information
rldhont committed Sep 2, 2020
2 parents 94a208f + 362af28 commit e60e65cbcee1d104f0c21e56ac7fd3c713004985
Showing with 4 additions and 2 deletions.
  1. +1 −1 src/core/qgsproject.h
  2. +0 −1 src/server/qgsconfigcache.cpp
  3. +3 −0 src/server/qgsserver.cpp
@@ -1976,7 +1976,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
friend class QgsProviderRegistry;

// Required by QGIS Server for switching the current project instance
friend class QgsConfigCache;
friend class QgsServer;

friend class TestQgsProject;
};
@@ -95,7 +95,6 @@ const QgsProject *QgsConfigCache::project( const QString &path, QgsServerSetting
QStringLiteral( "Server" ), Qgis::Critical );
}
}
QgsProject::setInstance( mProjectCache[ path ] );
return mProjectCache[ path ];

}
@@ -373,6 +373,9 @@ void QgsServer::handleRequest( QgsServerRequest &request, QgsServerResponse &res
project = mConfigCache->project( configFilePath, sServerInterface->serverSettings() );
}

// Set the current project instance
QgsProject::setInstance( const_cast<QgsProject *>( project ) );

if ( project )
{
sServerInterface->setConfigFilePath( project->fileName() );

0 comments on commit e60e65c

Please sign in to comment.
You can’t perform that action at this time.