From 6066f8260321becbbc5782ac3943e50fb0dde9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 7 Mar 2016 20:54:03 +0100
Subject: [PATCH] #1193 One layer shape fix in button

---
 .../src/com/jpexs/decompiler/flash/xfl/XFLConverter.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index e74faf045..359a93fcf 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -1285,7 +1285,12 @@ public class XFLConverter {
                                     CharacterTag character = characters.get(rec.characterId);
                                     MATRIX matrix = rec.placeMatrix;
                                     String recCharStr;
-                                    if (character instanceof TextTag) {
+
+                                    int characterId = character.getCharacterId();
+                                    if ((character instanceof ShapeTag) && (nonLibraryShapes.contains(characterId))) {
+                                        ShapeTag shape = (ShapeTag) character;
+                                        recCharStr = convertShape(characters, matrix, shape.getShapeNum(), shape.getShapes().shapeRecords, shape.getShapes().fillStyles, shape.getShapes().lineStyles, false, false);
+                                    } else if (character instanceof TextTag) {
                                         recCharStr = convertText(null, (TextTag) character, matrix, filters, null);
                                     } else if (character instanceof DefineVideoStreamTag) {
                                         recCharStr = convertVideoInstance(null, matrix, (DefineVideoStreamTag) character, null);
@@ -2212,7 +2217,7 @@ public class XFLConverter {
         if (ret2.length() > 0) {
             ret.append("<DOMLayer name=\"Layer ").append(layerIndex).append("\" color=\"").append(randomOutlineColor()).append("\">"
                     + "<frames>").append(ret2).append("</frames>"
-                            + "</DOMLayer>");
+                    + "</DOMLayer>");
         }
     }