LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-07 11:04:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly terminating debug session on Flash player manual close

Browse Source
This commit is contained in:
Jindra Petřík
2018-07-14 22:16:32 +02:00
parent 4518769b45
commit f1960ffdde
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/jpexs/decompiler/flash/gui/DebugPanel.java
View File

@@ -86,7 +86,7 @@ public class DebugPanel extends JPanel {
private boolean loading = false;
public ABCPanel.VariablesTableModel localsTable;
public static enum SelectedTab {
LOG, STACK, SCOPECHAIN, LOCALS, REGISTERS, CALLSTACK, CONSTANTPOOL

9
src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
View File

@@ -632,8 +632,8 @@ public class DebuggerHandler implements DebugConnectionListener {
@Override
public void run() {
try {
con.sendMessage(new OutGetSwf(con, (int) s.index), InGetSwf.class);
con.sendMessage(new OutGetSwd(con, (int) s.index), InGetSwd.class);
con.sendMessageWithTimeout(new OutGetSwf(con, (int) s.index), InGetSwf.class);
con.sendMessageWithTimeout(new OutGetSwd(con, (int) s.index), InGetSwd.class);
} catch (IOException ex) {
//ignore
}
@@ -693,8 +693,8 @@ public class DebuggerHandler implements DebugConnectionListener {
}
try {
breakInfo = con.getMessage(InBreakAtExt.class);
breakReason = con.sendMessage(new OutGetBreakReason(con), InBreakReason.class);
breakInfo = con.getMessage(InBreakAtExt.class, DebuggerConnection.PREF_RESPONSE_TIMEOUT);
breakReason = con.sendMessageWithTimeout(new OutGetBreakReason(con), InBreakReason.class);
String newBreakScriptName = "unknown";
if (modulePaths.containsKey(message.file)) {
@@ -764,7 +764,6 @@ public class DebuggerHandler implements DebugConnectionListener {
}
} catch (IOException ex) {
synchronized (this) {
connected = false;
}

2
src/com/jpexs/decompiler/flash/gui/abc/DecompiledEditorPane.java
View File

@@ -811,7 +811,7 @@ public class DecompiledEditorPane extends DebuggableEditorPane implements CaretL
final String identifier = abcPanel.getMainPanel().getActionPanel().getStringUnderPosition(pos, abcPanel.decompiledTextArea);
if (identifier != null && !identifier.isEmpty()) {
String tooltipText = abcPanel.getDebugPanel().localsTable.TryGetDebugHoverToolTipText(identifier);
String tooltipText = abcPanel.getDebugPanel().localsTable.tryGetDebugHoverToolTipText(identifier);
return (tooltipText == null ? super.getToolTipText() : tooltipText);
}