[QGIS Commit] r10922 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-06-14 13:10:34 -0400 (Sun, 14 Jun 2009)
New Revision: 10922

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
Unfreeze canvas also when cancel is clicked in open ogr layer dialog.


Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-06-14 14:21:44 UTC (rev 10921)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-06-14 17:10:34 UTC (rev 10922)
@@ -2347,16 +2347,14 @@
   {
     QStringList selectedSources = ovl->dataSources();
     QString enc = ovl->encoding();
-    if ( selectedSources.isEmpty() )
+    if ( !selectedSources.isEmpty() )
     {
-      // no files were selected, so just bail
-      mMapCanvas->freeze( false );
-      return;
-    }
-    else
       addVectorLayers( selectedSources, enc, ovl->dataSourceType() );
+    }
   }
 
+  mMapCanvas->freeze( false );
+
   delete ovl;
   // update UI
   qApp->processEvents();