LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 03:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Breakpoints are hidden until disassembly/decompilation is complete.

Browse Source 
Fixed AS1/2 Vanishing source code in some cases
This commit is contained in:
Jindra Petřík
2023-12-30 18:06:08 +01:00
parent f3e3bd941a
commit b976096e57
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+17 -2
View File
@@ -516,6 +516,8 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
} else {
decompiledText = SWF.getFromCache(asm);
}
HighlightedText fdecompiledText = decompiledText;
setDecompiledEditMode(false);
setEditMode(false);
@@ -533,20 +535,23 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
ActionList innerActions = actions;
if (disassemblingNeeded) {
View.execInEventDispatch(() -> {
editor.setShowMarkers(false);
setEditorText(asm.getScriptName(), asm.getExportedScriptName(), "; " + AppStrings.translate("work.disassembling") + "...", "text/flasm");
if (decompileNeeded) {
decompiledEditor.setShowMarkers(false);
setDecompiledText("-", "-", "// " + AppStrings.translate("work.waitingfordissasembly") + "...");
}
});
DisassemblyListener listener = getDisassemblyListener();
asm.addDisassemblyListener(listener);
innerActions = asm.getActions();
innerActions = asm.getActions();
asm.removeDisassemblyListener(listener);
}
if (decompileNeeded) {
View.execInEventDispatch(() -> {
decompiledEditor.setShowMarkers(false);
setDecompiledText("-", "-", "// " + AppStrings.translate("work.decompiling") + "...");
});
@@ -555,6 +560,11 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
View.execInEventDispatch(() -> {
setSourceCompleted(asm, htext, finalActions);
});
} else {
ActionList finalActions = innerActions;
View.execInEventDispatch(() -> {
setSourceCompleted(asm, fdecompiledText, finalActions);
});
}
return null;
@@ -571,9 +581,11 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
try {
get();
} catch (CancellationException ex) {
editor.setShowMarkers(false);
setEditorText("-", "-", "; " + AppStrings.translate("work.canceled"), "text/flasm");
} catch (Exception ex) {
logger.log(Level.SEVERE, "Error", ex);
decompiledEditor.setShowMarkers(false);
setDecompiledText("-", "-", "// " + AppStrings.translate("decompilationError") + ": " + ex);
}
});
@@ -583,6 +595,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
worker.execute();
setSourceWorker = worker;
if (!Main.isDebugging()) {
decompiledEditor.setShowMarkers(false);
Main.startWork(AppStrings.translate("work.decompiling") + "...", worker);
}
} else {
@@ -596,7 +609,9 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
if (decompiledText == null) {
decompiledText = HighlightedText.EMPTY;
}
editor.setShowMarkers(true);
decompiledEditor.setShowMarkers(true);
lastASM = asm;
lastCode = actions;
lastDecompiled = decompiledText;