eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix a crash on startup problem (console being null)

Browse Source
This commit is contained in:
benfry
2009-08-11 20:04:38 +00:00
parent b9ea5c1d69
commit 8b0c9dd766
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/EditorConsole.java
+28 -23
View File
@@ -305,16 +305,17 @@ public class EditorConsole extends JScrollPane {
public void flush() { }
public void write(byte b[]) { // appears never to be used
// if (currentConsole.isDisplayable()) {
currentConsole.write(b, 0, b.length, err);
// } else {
// systemOut.println("not displayable");
// if (err) {
// systemErr.write(b, 0, b.length);
// } else {
// systemOut.write(b, 0, b.length);
// }
// }
if (currentConsole != null) {
currentConsole.write(b, 0, b.length, err);
} else {
try {
if (err) {
systemErr.write(b);
} else {
systemOut.write(b);
}
} catch (IOException e) { } // just ignore, where would we write?
}
OutputStream echo = err ? stderrFile : stdoutFile;
if (echo != null) {
@@ -329,18 +330,17 @@ public class EditorConsole extends JScrollPane {
}
public void write(byte b[], int offset, int length) {
currentConsole.write(b, offset, length, err);
// if (currentConsole.isDisplayable()) {
// systemOut.println("is displayable");
// currentConsole.write(b, offset, length, err);
// } else {
// systemOut.println("not displayable");
// if (err) {
// systemErr.write(b, offset, length);
// } else {
// systemOut.write(b, offset, length);
// }
// }
if (currentConsole != null) {
currentConsole.write(b, offset, length, err);
} else {
try {
if (err) {
systemErr.write(b);
} else {
systemOut.write(b);
}
} catch (IOException e) { } // just ignore, where would we write?
}
OutputStream echo = err ? stderrFile : stdoutFile;
if (echo != null) {
@@ -356,7 +356,12 @@ public class EditorConsole extends JScrollPane {
public void write(int b) {
single[0] = (byte)b;
currentConsole.write(single, 0, 1, err);
if (currentConsole != null) {
currentConsole.write(single, 0, 1, err);
} else {
// redirect for all the extra handling above
write(new byte[] { (byte) b }, 0, 1);
}
OutputStream echo = err ? stderrFile : stdoutFile;
if (echo != null) {