From 91b420e80b89f2ccd87ebeba1de92c883afa096c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 23 Jan 2023 19:21:47 +0100
Subject: [PATCH] Fixed #1941 Export when no node is selected after SWF opening

---
 CHANGELOG.md                                       |  2 ++
 .../jpexs/decompiler/flash/gui/MainFrameMenu.java  | 14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b924d2d76..b51a76a59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - [#1948] Timeout while deobfuscation did not skip method
 - [#1948] NullPointerException on Simplify expressions on incrementent/decrement
+- [#1941] Export when no node is selected after SWF opening
 
 ## [18.3.3] - 2023-01-22
 ### Added
@@ -2908,6 +2909,7 @@ All notable changes to this project will be documented in this file.
 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8
 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7
 [#1948]: https://www.free-decompiler.com/flash/issues/1948
+[#1941]: https://www.free-decompiler.com/flash/issues/1941
 [#1913]: https://www.free-decompiler.com/flash/issues/1913
 [#1888]: https://www.free-decompiler.com/flash/issues/1888
 [#1894]: https://www.free-decompiler.com/flash/issues/1894
diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
index b72d9e96b..76cad431d 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
@@ -430,7 +430,7 @@ public abstract class MainFrameMenu implements MenuBuilder {
         View.checkAccess();
 
         if (openable != null) {
-            mainFrame.getPanel().export(onlySelected, mainFrame.getPanel().getCurrentTree().getSelected());
+            mainFrame.getPanel().export(onlySelected, getSelectedOrCurrentOpenable());
             return true;
         }
 
@@ -456,7 +456,7 @@ public abstract class MainFrameMenu implements MenuBuilder {
             return;
         }
 
-        mainFrame.getPanel().importSwfXml(mainFrame.getPanel().getCurrentTree().getSelected());
+        mainFrame.getPanel().importSwfXml(getSelectedOrCurrentOpenable());
     }
 
     protected void exportXmlActionPerformed(ActionEvent evt) {
@@ -467,7 +467,15 @@ public abstract class MainFrameMenu implements MenuBuilder {
             return;
         }
 
-        mainFrame.getPanel().exportSwfXml(mainFrame.getPanel().getCurrentTree().getSelected());
+        mainFrame.getPanel().exportSwfXml(getSelectedOrCurrentOpenable());
+    }
+    
+    private List<TreeItem> getSelectedOrCurrentOpenable() {
+        List<TreeItem> sel = mainFrame.getPanel().getCurrentTree().getSelected();
+        if (sel.isEmpty() && openable != null) {
+            sel.add(openable);
+        }
+        return sel;
     }
 
     protected boolean searchActionPerformed(ActionEvent evt) {