Fixed: #2348 Export FLA CS4 or below with more than 255 instances

Switching ribbon/nonribbon fix.
jindrapetrik · Oct 23, 2024 · ce54be7 · ce54be7
1 parent 5fdb9ce
commit ce54be7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,8 @@ All notable changes to this project will be documented in this file.
 - Cache as bitmap background color support (rendering, image and FLA export)
 
 ### Fixed
-- [#2344] Export to FLA CS4 and below with more than 255 library items,
-  bitmap fills or frame duration
+- [#2344], [#2348] Export to FLA CS4 and below with more than 255 library items,
+  instances, bitmap fills or frame duration
 - [#2341] FLA export - linkage and imported fonts did not work correctly
 - [#2345] items smaller than 20 twips were not drawn - caused PDF problems - now ceil is used
 - [#2341] FLA export - DefineEditText - use its default text color on HTML enabled inputs
@@ -3620,6 +3620,7 @@ Major version of SWF to XML export changed to 2.
 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8
 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7
 [#2344]: https://www.free-decompiler.com/flash/issues/2344
+[#2348]: https://www.free-decompiler.com/flash/issues/2348
 [#2341]: https://www.free-decompiler.com/flash/issues/2341
 [#2345]: https://www.free-decompiler.com/flash/issues/2345
 [#2321]: https://www.free-decompiler.com/flash/issues/2321

diff --git a/lib/flacomdoc.jar b/lib/flacomdoc.jar
diff --git a/libsrc/ffdec_lib/lib/flacomdoc.jar b/libsrc/ffdec_lib/lib/flacomdoc.jar
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -464,6 +464,7 @@ public void savePins() {
     }
 
     public void clearPins() {
+        pinsPanel.setCurrent(null);
         pinsPanel.clear();
     }
 

diff --git a/src/com/jpexs/decompiler/flash/gui/PinsPanel.java b/src/com/jpexs/decompiler/flash/gui/PinsPanel.java
@@ -98,6 +98,13 @@ public void setCurrent(TreeItem item) {
         if (lastSelectedButton != null) {
             lastSelectedButton.setSelected(false);
         }
+
+        if (item == null) {
+            current = null;
+            rebuild();
+            return;
+        }
+
         TreeItem itemNoTs = item;
         if (item instanceof TagScript) {
             itemNoTs = ((TagScript) item).getTag();
-Original file line number
+Diff line change
@@ Expand Up / @@ -464,6 +464,7 @@ public void savePins() { @@
         }
         public void clearPins() {
+            pinsPanel.setCurrent(null);
             pinsPanel.clear();
         }
@@ Expand Down @@