Merge pull request #1 from r888800009/fix_recursion

Fixed incorrect parsing recursion order
Inochi2D · Aug 25, 2024 · 6a0bd41 · 6a0bd41
2 parents 25453ad + f9ed4f4
commit 6a0bd41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/kra/layer.d b/source/kra/layer.d
@@ -308,7 +308,7 @@ public:
 	 */
 	bool isLayerUseful()
 	{
-		return !isLayerGroup() && (width != 0 && height != 0);
+		return !isLayerGroup() && (width != 0 && height != 0) || isLayerGroup();
 	}
 
 	/**

diff --git a/source/kra/parser.d b/source/kra/parser.d
@@ -136,14 +136,14 @@ void importAttributes(ref KRA kra, ref DOMEntity!string layerEntity)
 				kra.layers ~= paintLayer;
 			break;
 		case "grouplayer":
-			importAttributes(kra, l.children[0]);
 
 			auto collapsed = cast(bool) getAttrValue!int(attrs, "collapsed", 0);
 
 			auto groupLayer = baseLayer(attrs);
 			groupLayer.type = (collapsed) ? LayerType.ClosedFolder : LayerType.OpenFolder;
 			kra.layers ~= groupLayer;
 
+			importAttributes(kra, l.children[0]);
 			Layer groupEnd;
 			groupEnd.type = LayerType.SectionDivider;
 			kra.layers ~= groupEnd;