Fix snapping may never be indexed

m-kuhn · m-kuhn · commit 148e8082021d · 2015-10-20T16:42:32.000+02:00
diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -318,22 +318,22 @@ void QgsSnappingUtils::prepareIndex( const QList<QgsVectorLayer*>& layers )
     if ( willUseIndex( vl ) && !locatorForLayer( vl )->hasIndex() )
       layersToIndex << vl;
   }
-  if ( layersToIndex.isEmpty() )
-    return;
-
-  // build indexes
-  QTime t; t.start();
-  int i = 0;
-  prepareIndexStarting( layersToIndex.count() );
-  Q_FOREACH ( QgsVectorLayer* vl, layersToIndex )
+  if ( !layersToIndex.isEmpty() )
   {
-    QTime tt; tt.start();
-    if ( !locatorForLayer( vl )->init( mStrategy == IndexHybrid ? 1000000 : -1 ) )
-      mHybridNonindexableLayers.insert( vl->id() );
-    QgsDebugMsg( QString( "Index init: %1 ms (%2)" ).arg( tt.elapsed() ).arg( vl->id() ) );
-    prepareIndexProgress( ++i );
+    // build indexes
+    QTime t; t.start();
+    int i = 0;
+    prepareIndexStarting( layersToIndex.count() );
+    Q_FOREACH ( QgsVectorLayer* vl, layersToIndex )
+    {
+      QTime tt; tt.start();
+      if ( !locatorForLayer( vl )->init( mStrategy == IndexHybrid ? 1000000 : -1 ) )
+        mHybridNonindexableLayers.insert( vl->id() );
+      QgsDebugMsg( QString( "Index init: %1 ms (%2)" ).arg( tt.elapsed() ).arg( vl->id() ) );
+      prepareIndexProgress( ++i );
+    }
+    QgsDebugMsg( QString( "Prepare index total: %1 ms" ).arg( t.elapsed() ) );
   }
-  QgsDebugMsg( QString( "Prepare index total: %1 ms" ).arg( t.elapsed() ) );
   mIsIndexing = false;
 }
 
