[QGIS Commit] r8117 - in trunk/qgis/src: app providers/postgres

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-02-08 03:07:42 -0500 (Fri, 08 Feb 2008)
New Revision: 8117

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
Log:
Fix for bug where projects loaded slowly

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-02-07 16:58:37 UTC (rev 8116)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-02-08 08:07:42 UTC (rev 8117)
@@ -2669,6 +2669,7 @@
     delete openFileDialog;
 
     // clear out any stuff from previous project
+    mMapCanvas->freeze(true);
     removeAllLayers();
 
     QgsProject::instance()->filename( fullPath );
@@ -2704,6 +2705,9 @@
           tr("") + "\n" + QString::fromLocal8Bit( e.what() ) );
       QgsDebugMsg("BAD LAYERS FOUND");
     }
+
+    mMapCanvas->freeze(false);
+    mMapCanvas->refresh();
   }
 
 } // QgisApp::fileOpen

Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp	2008-02-07 16:58:37 UTC (rev 8116)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp	2008-02-08 08:07:42 UTC (rev 8117)
@@ -546,7 +546,10 @@
   ready = true;
   PQexec(connection, (const char *)(declare.utf8()));
 
-  mFeatureQueue.empty();
+  while(!mFeatureQueue.empty())
+    {
+      mFeatureQueue.pop();
+    }
   mFirstFetch = true;
 }