Followup 75fcd2, fix incorrect refreshing icon if mssql connection

loaded while collapsed
qgis · Feb 5, 2016 · 070b28a800127c777ce0cedc76a708feb512a86c · 070b28a
1 parent 99cef42
commit 070b28a800127c777ce0cedc76a708feb512a86c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -116,6 +116,8 @@ QVector<QgsDataItem*> QgsMssqlConnectionItem::createChildren()
 {
   QgsDebugMsg( "Entered" );
 
+  setState( Populating );
+
   stop();
 
   QVector<QgsDataItem*> children;
@@ -248,25 +250,26 @@ QVector<QgsDataItem*> QgsMssqlConnectionItem::createChildren()
     // spawn threads (new layers will be added later on)
     if ( mColumnTypeThread )
     {
-      connect( mColumnTypeThread, SIGNAL( finished() ), this, SLOT( setChildrenAsPopulated() ) );
+      connect( mColumnTypeThread, SIGNAL( finished() ), this, SLOT( setAsPopulated() ) );
       mColumnTypeThread->start();
     }
     else
     {
       //set all as populated
-      setChildrenAsPopulated();
+      setAsPopulated();
     }
   }
 
   return children;
 }
 
-void QgsMssqlConnectionItem::setChildrenAsPopulated()
+void QgsMssqlConnectionItem::setAsPopulated()
 {
   Q_FOREACH ( QgsDataItem *child, mChildren )
   {
     child->setState( Populated );
   }
+  setState( Populated );
 }
 
 void QgsMssqlConnectionItem::setLayerType( QgsMssqlLayerProperty layerProperty )

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