From a36e16fc737913a8e0ccde853f57bfc54011b507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Fri, 25 Oct 2024 17:22:08 +0200
Subject: [PATCH] Fixed: FLA export AS linkage / import

---
 lib/flacomdoc.jar                             | Bin 181850 -> 181849 bytes
 libsrc/ffdec_lib/lib/flacomdoc.jar            | Bin 181850 -> 181849 bytes
 .../decompiler/flash/xfl/XFLConverter.java    |  19 +++++++++---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/flacomdoc.jar b/lib/flacomdoc.jar
index 62009cb80c427abd2a6978dd5c3b8f354cf08a88..bb42c87c90db4f837e1582968aca0ceab86db33c 100644
GIT binary patch
delta 345
zcmccB!+o=dn>WClnT3mifrEizO<UwdUJd5eZIO)@trm=1Etu9X;{*yut})<Vd}I2D
zWlRe7euoVN+RDA_+9#i4+mf!{=cSs@+R1om!o;JU=T~a0JN7lN5P0v$BFI&Kxc=9_
z{2jifpOh`+Ii8sWOIb~>Np{-d;BD(V`NSbz8Se@`?H%@ZVRLfj7VT$TxgbZ#V~S<R
zqXnCq&peP)RZ5?8buz!%&%P}O=7#K+=ly*BX7lvrOY5(fH@RFBxpvFeGg0<b)QUq7
zZGOgCrS_a^$u9V)`RcQDZO@#&!7_g@WZyY=I`aMPU@r06uRCMn>rZVney*4m!+8Hc
z`$VRh6R*AazE^ZZi2qu@LZx&27z4Z+nM9c3p%BS{1UMO3pgaMFx6}DoFv)>JXuH7*
UrU$Y}p(A;W$(rryawec!03}a~iU0rr

delta 301
zcmV+|0n+~2j0@U~3zNVC8j%_s1Cyp$fjEUY0kt>+ucir<rdU~tu8^16m++<nAb)Oy
zFcd|1B>%&clC5oGY$G6&w`Azh(t)vyF%NKLpfYyVsOrDhYEeb?hIe)D8Sbtg%mSUU
z2=S}n=TUj1m9;nMaYCm&w(tPw3ZAPPF6YOZB)fVD_rL^H+5@98FnY?^iI;Fk8Kop4
zNfV51y%|xa^vJ~VN2A4S^x)-b?N_DZCDTQkQ!R4Qc7^Vmf^jZ#uCqKVJJE2SqQKQh
zC$De#v5@2)-D2iR(nCCwOr{^ay~+LOn!f&&!>F#alXL^j^dC61s21F!-+3F*ViS7l
zU5H!00hfQO0vwkCr~)eklcrd=FQ@|G9hcCz0t5w#u8^16ml(zZI|k;b0ssI2z8jQE

diff --git a/libsrc/ffdec_lib/lib/flacomdoc.jar b/libsrc/ffdec_lib/lib/flacomdoc.jar
index 62009cb80c427abd2a6978dd5c3b8f354cf08a88..bb42c87c90db4f837e1582968aca0ceab86db33c 100644
GIT binary patch
delta 345
zcmccB!+o=dn>WClnT3mifrEizO<UwdUJd5eZIO)@trm=1Etu9X;{*yut})<Vd}I2D
zWlRe7euoVN+RDA_+9#i4+mf!{=cSs@+R1om!o;JU=T~a0JN7lN5P0v$BFI&Kxc=9_
z{2jifpOh`+Ii8sWOIb~>Np{-d;BD(V`NSbz8Se@`?H%@ZVRLfj7VT$TxgbZ#V~S<R
zqXnCq&peP)RZ5?8buz!%&%P}O=7#K+=ly*BX7lvrOY5(fH@RFBxpvFeGg0<b)QUq7
zZGOgCrS_a^$u9V)`RcQDZO@#&!7_g@WZyY=I`aMPU@r06uRCMn>rZVney*4m!+8Hc
z`$VRh6R*AazE^ZZi2qu@LZx&27z4Z+nM9c3p%BS{1UMO3pgaMFx6}DoFv)>JXuH7*
UrU$Y}p(A;W$(rryawec!03}a~iU0rr

delta 301
zcmV+|0n+~2j0@U~3zNVC8j%_s1Cyp$fjEUY0kt>+ucir<rdU~tu8^16m++<nAb)Oy
zFcd|1B>%&clC5oGY$G6&w`Azh(t)vyF%NKLpfYyVsOrDhYEeb?hIe)D8Sbtg%mSUU
z2=S}n=TUj1m9;nMaYCm&w(tPw3ZAPPF6YOZB)fVD_rL^H+5@98FnY?^iI;Fk8Kop4
zNfV51y%|xa^vJ~VN2A4S^x)-b?N_DZCDTQkQ!R4Qc7^Vmf^jZ#uCqKVJJE2SqQKQh
zC$De#v5@2)-D2iR(nCCwOr{^ay~+LOn!f&&!>F#alXL^j^dC61s21F!-+3F*ViS7l
zU5H!00hfQO0vwkCr~)eklcrd=FQ@|G9hcCz0t5w#u8^16ml(zZI|k;b0ssI2z8jQE

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 ad141b5f1..31c434017 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
@@ -2038,10 +2038,6 @@ public class XFLConverter {
                         }
                     }
                     if (isBitmapData) {
-                        if (!charactersExportedInFirstFrame.contains(symbol)) {
-                            writer.writeAttribute("linkageExportInFirstFrame", "false");
-                        }
-                        writer.writeAttribute("linkageExportForAS", true);
                         linkageExportForAS = true;
                         writer.writeAttribute("linkageClassName", characterClasses.get(symbol));
                     }
@@ -2052,6 +2048,9 @@ public class XFLConverter {
                     linkageExportForAS = true;
                     writer.writeAttribute("linkageIdentifier", characterVariables.get(symbol));
                 }
+                if (characterImportLinkageURL.containsKey(symbol)) {
+                    linkageExportForAS = false;
+                }
                 if (linkageExportForAS) {
                     if (!charactersExportedInFirstFrame.contains(symbol)) {
                         writer.writeAttribute("linkageExportInFirstFrame", "false");
@@ -2200,18 +2199,18 @@ public class XFLConverter {
             linkageExportForAS = true;
             writer.writeAttribute("linkageIdentifier", characterVariables.get(symbol));
         }
+        if (characterImportLinkageURL.containsKey(symbol)) {
+            writer.writeAttribute("linkageImportForRS", "true");
+            writer.writeAttribute("linkageURL", characterImportLinkageURL.get(symbol));
+            linkageExportForAS = false;
+        }
         if (linkageExportForAS) {
             if (!charactersExportedInFirstFrame.contains(symbol)) {
                 writer.writeAttribute("linkageExportInFirstFrame", "false");
             }
 
             writer.writeAttribute("linkageExportForAS", true);
-        }
-        
-        if (characterImportLinkageURL.containsKey(symbol)) {
-            writer.writeAttribute("linkageImportForRS", "true");
-            writer.writeAttribute("linkageURL", characterImportLinkageURL.get(symbol));
-        }
+        }                
     }
     
     private String prettyFormatXML(String input) {