Merge pull request #5305 from boundlessgeo/issue_15498_waitRenedering…

…EndToAvoidLock for SQlite vectors wait rendering end to avoid file lock: fixes #15498
qgis · Oct 12, 2017 · 6321923 · 6321923
2 parents 5e097d8 + 206965c
commit 6321923
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8003,6 +8003,18 @@ void QgisApp::saveEdits( QgsMapLayer *layer, bool leaveEditable, bool triggerRep
   if ( vlayer == activeLayer() )
     mSaveRollbackInProgress = true;
 
+  // stop rendering to avoid lock in case of
+  // splilte and gpkg fix #15498
+  if ( mMapCanvas->mapSettings().layers().contains( vlayer->id() ) )
+  {
+    if ( vlayer->dataProvider()->storageType().count( "SQLite" ) ||
+         vlayer->dataProvider()->storageType().count( "GPKG" ) )
+    {
+      if ( mMapCanvas->isDrawing() )
+        mMapCanvas->stopRendering();
+    }
+  }
+
   if ( !vlayer->commitChanges() )
   {
     mSaveRollbackInProgress = false;