Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Server: Call QgsProject::setInstance on project passed as parameter
  • Loading branch information
github-actions[bot] committed Aug 31, 2020
1 parent 41e0ec1 commit fe3106d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/qgsproject.h
Expand Up @@ -1797,7 +1797,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;
};
Expand Down
1 change: 0 additions & 1 deletion src/server/qgsconfigcache.cpp
Expand Up @@ -95,7 +95,6 @@ const QgsProject *QgsConfigCache::project( const QString &path, QgsServerSetting
QStringLiteral( "Server" ), Qgis::Critical );
}
}
QgsProject::setInstance( mProjectCache[ path ] );
return mProjectCache[ path ];

}
Expand Down
3 changes: 3 additions & 0 deletions src/server/qgsserver.cpp
Expand Up @@ -374,6 +374,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() );
Expand Down

0 comments on commit fe3106d

Please sign in to comment.