Start new layer group box collapsed

qgis · Jul 6, 2021 · 40785b5 · 40785b5
1 parent 9fc81ff
commit 40785b5
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/gui/qgsqueryresultwidget.cpp b/src/gui/qgsqueryresultwidget.cpp
@@ -60,6 +60,7 @@ QgsQueryResultWidget::QgsQueryResultWidget( QWidget *parent, QgsAbstractDatabase
 
   mStatusLabel->hide();
   mSqlErrorText->hide();
+  mLoadAsNewLayerGroupBox->setCollapsed( true );
   setConnection( connection );
 }
 
@@ -79,12 +80,17 @@ void QgsQueryResultWidget::executeQuery()
   mSqlErrorText->hide();
   mFirstRowFetched = false;
 
-  // Wait for other threads
+  // Cancel other threads
   if ( mFeedback )
   {
     mFeedback->cancel();
   }
-  mQueryResultWatcher.waitForFinished();
+
+  // ... and wait
+  if ( mQueryResultWatcher.isRunning() )
+  {
+    mQueryResultWatcher.waitForFinished();
+  }
 
   if ( mConnection )
   {