mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-27 10:55:33 +02:00
Bug 348700 - [terminal] Regression: Terminal is unusable after "Disconnect"
This commit is contained in:
parent
f097643ed1
commit
51d802bdce
1 changed files with 6 additions and 6 deletions
|
@ -359,13 +359,13 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
|
||||||
job.cancel();
|
job.cancel();
|
||||||
// Join job to avoid leaving job running after workbench shutdown (333613).
|
// Join job to avoid leaving job running after workbench shutdown (333613).
|
||||||
try {
|
try {
|
||||||
fInputStream.close();
|
// The Job will check its cancel status after 500msec latest. But we still
|
||||||
|
// Interrupt the Job, such that it can join fast enough during Workbench shutdown (bug 333613).
|
||||||
|
// TODO closing fInputStream may seem more clean but causes problems (bug 348700).
|
||||||
|
Thread t = job.getThread();
|
||||||
|
if(t!=null) t.interrupt();
|
||||||
job.join();
|
job.join();
|
||||||
} catch (IOException e1) {
|
} catch (InterruptedException e) {}
|
||||||
} catch (InterruptedException e) {
|
|
||||||
}
|
|
||||||
// Thread t = job.getThread();
|
|
||||||
// if(t!=null) t.interrupt();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getState()==TerminalState.CLOSED) {
|
if (getState()==TerminalState.CLOSED) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue