From 947a17b9879c3d8708985b30fd57b22d225d95d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 10 Dec 2022 16:22:00 +0100 Subject: [PATCH] Placeobject to string when it has classname --- .../flash/tags/base/PlaceObjectTypeTag.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java index 6fbc63bae..9dfaf7545 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/PlaceObjectTypeTag.java @@ -94,14 +94,25 @@ public abstract class PlaceObjectTypeTag extends Tag implements CharacterIdTag { @Override public String getName() { String result = super.getName(); - String exportName = swf.getExportName(getCharacterId()); + int charId = getCharacterId(); + String charClassName = getClassName(); + String exportName = null; + if (charId == -1 && charClassName != null) { + exportName = charClassName; + CharacterTag ch = swf.getCharacterByClass(charClassName); + if (ch != null) { + charId = ch.getCharacterId(); + } + } else { + exportName = swf.getExportName(charId); + } String nameAppend = ""; if (exportName != null) { nameAppend = ": " + exportName; } - if (getCharacterId() != -1) { - result += " (" + getCharacterId() + nameAppend + ")"; + if (charId != -1) { + result += " (" + charId + nameAppend + ")"; } else if (!nameAppend.isEmpty()) { result += " (" + nameAppend + ")"; }