Fix mssql browser items not correctly populated before refreshing

qgis · Feb 3, 2016 · 75fcd2d · 75fcd2d
1 parent 316a941
commit 75fcd2d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -206,6 +206,7 @@ QVector<QgsDataItem*> QgsMssqlConnectionItem::createChildren()
       if ( !schemaItem )
       {
         schemaItem = new QgsMssqlSchemaItem( this, layer.schemaName, mPath + '/' + layer.schemaName );
+        schemaItem->setState( Populating );
         children.append( schemaItem );
       }
 
@@ -246,12 +247,28 @@ QVector<QgsDataItem*> QgsMssqlConnectionItem::createChildren()
 
     // spawn threads (new layers will be added later on)
     if ( mColumnTypeThread )
+    {
+      connect( mColumnTypeThread, SIGNAL( finished() ), this, SLOT( setChildrenAsPopulated() ) );
       mColumnTypeThread->start();
+    }
+    else
+    {
+      //set all as populated
+      setChildrenAsPopulated();
+    }
   }
 
   return children;
 }
 
+void QgsMssqlConnectionItem::setChildrenAsPopulated()
+{
+  Q_FOREACH ( QgsDataItem *child, mChildren )
+  {
+    child->setState( Populated );
+  }
+}
+
 void QgsMssqlConnectionItem::setLayerType( QgsMssqlLayerProperty layerProperty )
 {
   QgsMssqlSchemaItem *schemaItem = nullptr;

diff --git a/src/providers/mssql/qgsmssqldataitems.h b/src/providers/mssql/qgsmssqldataitems.h
@@ -77,6 +77,9 @@ class QgsMssqlConnectionItem : public QgsDataCollectionItem
 
     void refresh() override;
 
+  private slots:
+    void setChildrenAsPopulated();
+
   private:
     QString mConnInfo;
     QString mService;