From 2cef32100fd6510fc4e7f9797faa447ce3690023 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sun, 6 Mar 2016 21:10:55 +0100 Subject: [PATCH] continue fla exporting with the next file when an swf fails to export --- .../jpexs/decompiler/flash/tags/base/TextTag.java | 1 + .../flash/console/CommandLineArgumentParser.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java index 13c6c1ea4..7f11349f6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java @@ -303,6 +303,7 @@ public abstract class TextTag extends CharacterTag implements DrawableTag { allLeftMargins.add(currentLeftMargin); if (glyphs == null) { + // todo: ??? continue; } diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java index 24adb0fe6..86ae16932 100644 --- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java +++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java @@ -1577,10 +1577,15 @@ public class CommandLineArgumentParser { XFLExportSettings settings = new XFLExportSettings(); settings.compressed = compressed; settings.exportScript = exportScript; - if (Configuration.setFFDecVersionInExportedFont.get()) { - swf.exportXfl(handler, outFile, inFile.getName(), ApplicationInfo.APPLICATION_NAME, ApplicationInfo.applicationVerName, ApplicationInfo.version, Configuration.parallelSpeedUp.get(), flaVersion, settings); - } else { - swf.exportXfl(handler, outFile, inFile.getName(), ApplicationInfo.APPLICATION_NAME, ApplicationInfo.APPLICATION_NAME, "1.0.0", Configuration.parallelSpeedUp.get(), flaVersion, settings); + + try { + if (Configuration.setFFDecVersionInExportedFont.get()) { + swf.exportXfl(handler, outFile, inFile.getName(), ApplicationInfo.APPLICATION_NAME, ApplicationInfo.applicationVerName, ApplicationInfo.version, Configuration.parallelSpeedUp.get(), flaVersion, settings); + } else { + swf.exportXfl(handler, outFile, inFile.getName(), ApplicationInfo.APPLICATION_NAME, ApplicationInfo.APPLICATION_NAME, "1.0.0", Configuration.parallelSpeedUp.get(), flaVersion, settings); + } + } catch (Exception ex) { + logger.log(Level.SEVERE, "Error during XFL/FLA export", ex); } }