#823 crash when cancel in the middle of loading WFS

lixun910 · May 30, 2017 · 72498a9 · 72498a9
1 parent 88a2c4e
commit 72498a9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Project.cpp b/Project.cpp
@@ -1343,8 +1343,10 @@ void Project::CleanupPairsHLState()
 bool Project::CommonProjectInit()
 {	
 	wxLogMessage("Project::CommonProjectInit()");
-	if (!InitFromOgrLayer())
+    if (!InitFromOgrLayer()) {
+        OGRDataAdapter::GetInstance().Close();
         return false;
+    }
 
 	num_records = table_int->GetNumberRows();
 
@@ -1480,7 +1482,7 @@ bool Project::InitFromOgrLayer()
 				cont = prog_dlg.Update(layer_proxy->load_progress);
 			}
 		}
-		if (!cont)  {
+		if (!cont || !prog_dlg.Update(-1))  { // or if cancel clicked
 			OGRDataAdapter::GetInstance().T_StopReadLayer(layer_proxy);
 			return false;
 		}