[geonode] Fix crasher with blocking fetch layers function

qgis · Jan 12, 2022 · bf0baed · bf0baed
1 parent a708701
commit bf0baed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/core/geocms/geonode/qgsgeonoderequest.cpp b/src/core/geocms/geonode/qgsgeonoderequest.cpp
@@ -54,18 +54,22 @@ void QgsGeoNodeRequest::abort()
 void QgsGeoNodeRequest::fetchLayers()
 {
   request( QStringLiteral( "/api/layers/" ) );
-  QObject *obj = new QObject( this );
 
+  QObject *obj = new QObject( this );
   connect( this, &QgsGeoNodeRequest::requestFinished, obj, [obj, this ]
   {
-    QList<QgsGeoNodeRequest::ServiceLayerDetail> layers;
-    if ( mError.isEmpty() )
+    if ( !mParsingLayers )
     {
-      layers = parseLayers( this->lastResponse() );
+      mParsingLayers = true;
+      QList<QgsGeoNodeRequest::ServiceLayerDetail> layers;
+      if ( mError.isEmpty() )
+      {
+        layers = parseLayers( this->lastResponse() );
+      }
+      emit layersFetched( layers );
+      mParsingLayers = false;
+      obj->deleteLater();
     }
-    emit layersFetched( layers );
-
-    obj->deleteLater();
   } );
 }
 
@@ -74,11 +78,11 @@ QList<QgsGeoNodeRequest::ServiceLayerDetail> QgsGeoNodeRequest::fetchLayersBlock
   QList<QgsGeoNodeRequest::ServiceLayerDetail> layers;
 
   QEventLoop loop;
-  connect( this, &QgsGeoNodeRequest::requestFinished, &loop, &QEventLoop::quit );
   QObject *obj = new QObject( this );
   connect( this, &QgsGeoNodeRequest::layersFetched, obj, [&]( const QList<QgsGeoNodeRequest::ServiceLayerDetail> &fetched )
   {
     layers = fetched;
+    loop.exit();
   } );
   fetchLayers();
   loop.exec( QEventLoop::ExcludeUserInputEvents );
@@ -546,10 +550,10 @@ void QgsGeoNodeRequest::request( const QString &endPoint )
 
 bool QgsGeoNodeRequest::requestBlocking( const QString &endPoint )
 {
-  request( endPoint );
-
   QEventLoop loop;
   connect( this, &QgsGeoNodeRequest::requestFinished, &loop, &QEventLoop::quit );
+
+  request( endPoint );
   loop.exec( QEventLoop::ExcludeUserInputEvents );
 
   return mError.isEmpty();

diff --git a/src/core/geocms/geonode/qgsgeonoderequest.h b/src/core/geocms/geonode/qgsgeonoderequest.h
@@ -284,6 +284,7 @@ class CORE_EXPORT QgsGeoNodeRequest : public QObject
 
     bool mIsAborted = false;
     bool mForceRefresh = false;
+    bool mParsingLayers = false;
 
     QList<QgsGeoNodeRequest::ServiceLayerDetail> parseLayers( const QByteArray &layerResponse );
     QgsGeoNodeStyle retrieveStyle( const QString &styleUrl );