fix FS#2259 - Insert file as block: crash when inserting block with

attribute definitions
qcad · Jul 15, 2021 · c977907 · c977907
1 parent 21fecbe
commit c977907
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/core/RLinkedStorage.cpp b/src/core/RLinkedStorage.cpp
@@ -237,10 +237,16 @@ QSharedPointer<RLayer> RLinkedStorage::queryLayer(RLayer::Id layerId) const {
 }
 
 QSharedPointer<RLayer> RLinkedStorage::queryLayer(const QString& layerName) const {
-    if (!layerNameMap.contains(layerName)) {
-        return backStorage->queryLayer(layerName);
+    if (!layerNameMap.contains(layerName.toLower())) {
+        QSharedPointer<RLayer> ret = backStorage->queryLayer(layerName);
+        if (ret.isNull()) {
+            // safety net: should never happen:
+            return RMemoryStorage::queryLayer(layerName);
+        }
+        return ret;
     }
     return RMemoryStorage::queryLayer(layerName);
+
     //QSharedPointer<RLayer> ret = RMemoryStorage::queryLayer(layerName);
     //if (ret.isNull()) {
     //    ret = backStorage->queryLayer(layerName);