dwgReader::readDwgEntities() stop reading after 1st error

LibreCAD · Jan 8, 2022 · d397170 · d397170
1 parent 14f6870
commit d397170
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/intern/dwgreader.cpp b/src/intern/dwgreader.cpp
@@ -911,17 +911,17 @@ bool dwgReader::readPlineVertex(DRW_Polyline& pline, dwgBuffer *dbuf){
 
 bool dwgReader::readDwgEntities(DRW_Interface& intfa, dwgBuffer *dbuf){
     bool ret = true;
-    bool ret2 = true;
 
     DRW_DBG("\nobject map total size= "); DRW_DBG(ObjectMap.size());
     auto itB=ObjectMap.begin();
     auto itE=ObjectMap.end();
-    while (itB != itE){
-        ret2 = readDwgEntity(dbuf, itB->second, intfa);
-        ObjectMap.erase(itB);
-        itB=ObjectMap.begin();
-        if (ret)
-            ret = ret2;
+    while (itB != itE) {
+        if (ret) {
+            // once readDwgEntity() failed, just clear the ObjectMap
+            ret = readDwgEntity( dbuf, itB->second, intfa);
+        }
+        ObjectMap.erase( itB);
+        itB = ObjectMap.begin();
     }
     return ret;
 }