eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 05:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5486 from JakubValtar/fix-status-exception

Browse Source 
Fix sketch exception getting hidden by warning
This commit is contained in:
Ben Fry
2019-01-18 08:28:52 -08:00
committed by GitHub
parent 16b6ecd89f 6240843e95
commit 3380239e68
5 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/processing/mode/java/Debugger.java
View File

@@ -39,6 +39,7 @@ import javax.swing.JTree; // needed for javadocs
import javax.swing.tree.DefaultMutableTreeNode;
import processing.app.Messages;
import processing.app.RunnerListenerEdtAdapter;
import processing.app.Sketch;
import processing.app.SketchCode;
import processing.mode.java.debug.*;
@@ -201,7 +202,7 @@ public class Debugger {
//lineMap = LineMapping.generateMapping(srcPath + File.separator + mainClassName + ".java");
log("launching debuggee runtime");
runtime = new Runner(build, editor);
runtime = new Runner(build, new RunnerListenerEdtAdapter(editor));
VirtualMachine vm = runtime.debug(null); // non-blocking
if (vm == null) {
loge("error 37: launch failed", null);

5
java/src/processing/mode/java/JavaEditor.java
View File

@@ -1094,10 +1094,11 @@ public class JavaEditor extends Editor {
synchronized (runtimeLock) {
if (runtimeLaunchRequested) {
runtimeLaunchRequested = false;
RunnerListener listener = new RunnerListenerEdtAdapter(JavaEditor.this);
if (!tweak) {
runtime = jmode.handleLaunch(sketch, JavaEditor.this, present);
runtime = jmode.handleLaunch(sketch, listener, present);
} else {
runtime = jmode.handleTweak(sketch, JavaEditor.this);
runtime = jmode.handleTweak(sketch, listener);
}
}
}