Fix for bug where projects loaded slowly

git-svn-id: http://svn.osgeo.org/qgis/trunk@8117 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 8, 2008 · bcdcc68 · bcdcc68
1 parent e200531
commit bcdcc68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2669,6 +2669,7 @@ void QgisApp::fileOpen()
     delete openFileDialog;
 
     // clear out any stuff from previous project
+    mMapCanvas->freeze(true);
     removeAllLayers();
 
     QgsProject::instance()->filename( fullPath );
@@ -2704,6 +2705,9 @@ void QgisApp::fileOpen()
           tr("") + "\n" + QString::fromLocal8Bit( e.what() ) );
       QgsDebugMsg("BAD LAYERS FOUND");
     }
+
+    mMapCanvas->freeze(false);
+    mMapCanvas->refresh();
   }
 
 } // QgisApp::fileOpen

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -546,7 +546,10 @@ void QgsPostgresProvider::select(QgsAttributeList fetchAttributes,
   ready = true;
   PQexec(connection, (const char *)(declare.utf8()));
 
-  mFeatureQueue.empty();
+  while(!mFeatureQueue.empty())
+    {
+      mFeatureQueue.pop();
+    }
   mFirstFetch = true;
 }